Commit 7c7f252d authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile against qt6

parent 4836ae52
Pipeline #113906 passed with stage
in 1 minute and 7 seconds
......@@ -9,7 +9,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project(kteatime VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.15.0")
set(KF5_MIN_VERSION "5.85.0")
set(KF5_MIN_VERSION "5.89.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
......@@ -21,7 +21,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
include(FeatureSummary)
# Search KDE installation
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED
Core
Widgets
)
......@@ -29,7 +29,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
Config
Crash
DocTools
I18n
IconThemes
NotifyConfig
......@@ -37,6 +36,11 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
TextWidgets
XmlGui
)
find_package(KF5DocTools ${KF5_MIN_VERSION})
set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
"Tools to generate documentation"
TYPE OPTIONAL
)
add_definitions(
-DQT_DISABLE_DEPRECATED_BEFORE=0x050F00
-DQT_DEPRECATED_WARNINGS_SINCE=0x060000
......@@ -44,9 +48,13 @@ add_definitions(
-DKF_DEPRECATED_WARNINGS_SINCE=0x060000
)
ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(data)
ADD_SUBDIRECTORY(src)
ki18n_install(po)
if (KF5DocTools_FOUND)
kdoctools_install(po)
add_subdirectory(doc)
endif()
install(FILES org.kde.kteatime.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
......
......@@ -21,4 +21,4 @@ target_link_libraries(kteatime
install( TARGETS kteatime ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( PROGRAMS org.kde.kteatime.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( FILES kteatime.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
install( FILES kteatime.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR} )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment