Commit 1a39b91e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent c6ee451a
Pipeline #121310 passed with stage
in 2 minutes
......@@ -59,7 +59,7 @@ set(KDEPIM_LIB_SOVERSION "5")
set(AKONADINOTES_LIB_VERSION "5.19.40")
set(QT_REQUIRED_VERSION "5.15.2")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Widgets Test UiTools)
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Widgets Test UiTools)
find_package(KUserFeedback 1.0.0 CONFIG) # Needs Provider::describeDataSources()
set_package_properties(KUserFeedback PROPERTIES DESCRIPTION "User Feedback lib" TYPE OPTIONAL PURPOSE "Allow to send Telemetry Information (optional). It can be disable in apps.")
......@@ -112,7 +112,7 @@ find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIR
find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
find_package(Phonon4Qt5 CONFIG REQUIRED)
find_package(Phonon4Qt${QT_MAJOR_VERSION} CONFIG REQUIRED)
find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
......
......@@ -72,7 +72,7 @@ target_link_libraries(korganizer_kcm_static
KF5::IncidenceEditor
korganizer_core
korganizerprivate
Qt::UiTools
Qt${QT_MAJOR_VERSION}::UiTools
KF5::CalendarCore
KF5::Holidays
KF5::MailTransport
......
......@@ -13,7 +13,7 @@ target_link_libraries(testkodaymatrix
KF5::CalendarSupport
korganizer_core
korganizerprivate
Qt::Test
Qt${QT_MAJOR_VERSION}::Test
)
add_executable(testkodaymatrix_us testkodaymatrix_us.cpp ../kodaymatrix.cpp)
......@@ -25,13 +25,13 @@ target_link_libraries(testkodaymatrix_us
KF5::CalendarSupport
korganizer_core
korganizerprivate
Qt::Test
Qt${QT_MAJOR_VERSION}::Test
)
set(koeventpopupmenutest_SRCS ../koeventpopupmenu.cpp ../kocorehelper.cpp ../korganizer_debug.cpp)
set(koeventpopupmenutest_LIBS Qt::Test
Qt::Gui
Qt::Core
set(koeventpopupmenutest_LIBS Qt${QT_MAJOR_VERSION}::Test
Qt${QT_MAJOR_VERSION}::Gui
Qt${QT_MAJOR_VERSION}::Core
KF5::Mime
KF5::AkonadiWidgets
KF5::AkonadiCore
......
......@@ -14,7 +14,7 @@ target_link_libraries(korganizer_interfaces
KF5::CalendarSupport
KF5::EventViews
KF5::AkonadiCore
Qt::PrintSupport
Qt${QT_MAJOR_VERSION}::PrintSupport
KF5::Parts
)
......
......@@ -53,7 +53,7 @@ set(kcmtodosummary_PART_SRCS kcmtodosummary.cpp kcmtodosummary.h)
ki18n_wrap_ui(kcmtodosummary_PART_SRCS todosummaryconfig_base.ui)
add_library(kcmtodosummary MODULE ${kcmtodosummary_PART_SRCS})
target_link_libraries(kcmtodosummary Qt::Widgets KF5::KCMUtils KF5::I18n)
target_link_libraries(kcmtodosummary Qt${QT_MAJOR_VERSION}::Widgets KF5::KCMUtils KF5::I18n)
########## Unit Test ###########
if (BUILD_TESTING)
......
......@@ -11,6 +11,6 @@ target_link_libraries(
summaryeventtest
KF5::CalendarCore
KF5::CalendarUtils
Qt::Test
Qt${QT_MAJOR_VERSION}::Test
KF5::I18n
)
......@@ -33,7 +33,7 @@ set(kcmsdsummary_PART_SRCS kcmsdsummary.cpp kcmsdsummary.h)
ki18n_wrap_ui(kcmsdsummary_PART_SRCS sdsummaryconfig_base.ui)
add_library(kcmsdsummary MODULE ${kcmsdsummary_PART_SRCS})
target_link_libraries(kcmsdsummary Qt::Widgets KF5::KCMUtils KF5::I18n)
target_link_libraries(kcmsdsummary Qt${QT_MAJOR_VERSION}::Widgets KF5::KCMUtils KF5::I18n)
########### install files ###############
......
......@@ -25,7 +25,7 @@ set_target_properties(testkcmdesignerfields PROPERTIES COMPILE_FLAGS -DTESTKCMDE
target_link_libraries(testkcmdesignerfields
KF5::KIOCore
KF5::I18n
Qt::UiTools
Qt${QT_MAJOR_VERSION}::UiTools
KF5::KCMUtils
KF5::KIOWidgets
)
......@@ -15,7 +15,7 @@ add_test(NAME reparentingmodeltest COMMAND reparentingmodeltest)
ecm_mark_as_test(reparentingmodeltest)
ecm_mark_nongui_executable(reparentingmodeltest)
target_link_libraries(reparentingmodeltest
Qt::Test
Qt::Core
Qt::Gui
Qt${QT_MAJOR_VERSION}::Test
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Gui
)
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