Commit a6d9c33a authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent 9ffcba95
Pipeline #121145 passed with stage
in 1 minute and 27 seconds
......@@ -57,7 +57,7 @@ set(PIMCOMMON_LIB_VERSION "5.19.40")
option(KDEPIM_KUSERFEEDBACK "Enable user feedback support (experimental)" FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebEngine WebEngineWidgets PrintSupport)
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebEngine WebEngineWidgets PrintSupport)
find_package(Grantlee5 "5.2" CONFIG REQUIRED)
# Find KF5 package
......
......@@ -29,7 +29,7 @@ endif()
target_link_libraries(akregatorinterfaces
KF5::ConfigGui
Qt::Widgets
Qt${QT_MAJOR_VERSION}::Widgets
)
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregatorinterfaces PROPERTIES UNITY_BUILD ON)
......
......@@ -166,7 +166,7 @@ target_link_libraries(akregatorprivate
Grantlee5::Templates
KF5::KIOGui
KF5::MessageViewer
Qt::PrintSupport
Qt${QT_MAJOR_VERSION}::PrintSupport
KF5::WebEngineViewer
${akregator_userfeedback_LIB}
)
......@@ -285,7 +285,7 @@ target_link_libraries(akregatorpart
KF5::Parts
KF5::Notifications
KF5::TextWidgets
Qt::WebEngineWidgets
Qt${QT_MAJOR_VERSION}::WebEngineWidgets
KF5::WebEngineViewer
KF5::KIOGui
)
......
......@@ -5,7 +5,7 @@ macro(akregator_job_unittest _source)
ecm_add_test(${_source}
TEST_NAME ${_name}
NAME_PREFIX "akregator-job"
LINK_LIBRARIES Qt::Test akregatorprivate
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test akregatorprivate
)
endmacro ()
......
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