Fully port to Qt6
This commit is contained in:
parent
70b7360081
commit
7f03aa548c
2 changed files with 6 additions and 9 deletions
|
@ -6,12 +6,9 @@
|
|||
include:
|
||||
- project: sysadmin/ci-utilities
|
||||
file:
|
||||
- /gitlab-templates/linux.yml
|
||||
- /gitlab-templates/freebsd.yml
|
||||
- /gitlab-templates/windows.yml
|
||||
- /gitlab-templates/linux-qt6.yml
|
||||
- /gitlab-templates/freebsd-qt6.yml
|
||||
- /gitlab-templates/windows-qt6.yml
|
||||
- /gitlab-templates/clang-format.yml
|
||||
- /gitlab-templates/craft-windows-x86-64.yml
|
||||
- /gitlab-templates/craft-windows-appx-qt5.yml
|
||||
# - /gitlab-templates/craft-windows-x86-64-qt6.yml TODO re-enable when Qt6 Craft build works
|
||||
# - /gitlab-templates/craft-windows-appx-qt6.yml
|
||||
|
|
|
@ -8,8 +8,8 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
|
|||
|
||||
project(kdeconnect VERSION ${RELEASE_SERVICE_VERSION})
|
||||
|
||||
set(KF_MIN_VERSION "5.101.0")
|
||||
set(QT_MIN_VERSION "5.15.2")
|
||||
set(KF_MIN_VERSION "5.240")
|
||||
set(QT_MIN_VERSION "6.6.0")
|
||||
|
||||
find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
|
||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||
|
@ -49,8 +49,8 @@ else()
|
|||
endif()
|
||||
|
||||
ecm_set_disabled_deprecation_versions(
|
||||
QT ${QT_MIN_VERSION}
|
||||
KF ${KF_MIN_VERSION}
|
||||
QT 5.15
|
||||
KF 5.110
|
||||
)
|
||||
|
||||
# Make the version header available by linking against kdeconnectversion
|
||||
|
|
Loading…
Reference in a new issue