tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fully port to Qt6

Browse source
This commit is contained in:
Nicolas Fella 2023-12-14 00:49:54 +01:00
parent 70b7360081
commit 7f03aa548c
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -6,12 +6,9 @@
include: include:
- project: sysadmin/ci-utilities - project: sysadmin/ci-utilities
file: file:
- /gitlab-templates/linux.yml
- /gitlab-templates/freebsd.yml
- /gitlab-templates/windows.yml
- /gitlab-templates/linux-qt6.yml - /gitlab-templates/linux-qt6.yml
- /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/windows-qt6.yml - /gitlab-templates/windows-qt6.yml
- /gitlab-templates/clang-format.yml - /gitlab-templates/clang-format.yml
- /gitlab-templates/craft-windows-x86-64.yml # - /gitlab-templates/craft-windows-x86-64-qt6.yml TODO re-enable when Qt6 Craft build works
- /gitlab-templates/craft-windows-appx-qt5.yml # - /gitlab-templates/craft-windows-appx-qt6.yml

8
CMakeLists.txt
View file

@ -8,8 +8,8 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project(kdeconnect VERSION ${RELEASE_SERVICE_VERSION}) project(kdeconnect VERSION ${RELEASE_SERVICE_VERSION})
set(KF_MIN_VERSION "5.101.0") set(KF_MIN_VERSION "5.240")
set(QT_MIN_VERSION "5.15.2") set(QT_MIN_VERSION "6.6.0")
find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
@ -49,8 +49,8 @@ else()
endif() endif()
ecm_set_disabled_deprecation_versions( ecm_set_disabled_deprecation_versions(
QT ${QT_MIN_VERSION} QT 5.15
KF ${KF_MIN_VERSION} KF 5.110
) )
# Make the version header available by linking against kdeconnectversion # Make the version header available by linking against kdeconnectversion