Commit 0d6d4e11 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against qt5.15 so we use Qt:: and qt_ macro

parent ce8772fa
......@@ -3,29 +3,29 @@
add_definitions(-DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
ecm_add_test(jnisignaturetest.cpp LINK_LIBRARIES Qt5::Test KAndroidExtras)
ecm_add_test(jnipropertytest.cpp LINK_LIBRARIES Qt5::Test KAndroidExtras)
ecm_add_test(jniarraytest.cpp LINK_LIBRARIES Qt5::Test KAndroidExtras)
ecm_add_test(androidwrappertest.cpp LINK_LIBRARIES Qt5::Test KAndroidExtras)
ecm_add_test(jnisignaturetest.cpp LINK_LIBRARIES Qt::Test KAndroidExtras)
ecm_add_test(jnipropertytest.cpp LINK_LIBRARIES Qt::Test KAndroidExtras)
ecm_add_test(jniarraytest.cpp LINK_LIBRARIES Qt::Test KAndroidExtras)
ecm_add_test(androidwrappertest.cpp LINK_LIBRARIES Qt::Test KAndroidExtras)
ecm_add_test(gpxwritertest.cpp LINK_LIBRARIES Qt5::Test GpxIo)
ecm_add_test(gpxwritertest.cpp LINK_LIBRARIES Qt::Test GpxIo)
ecm_add_test(pkpassmanagertest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(reservationmanagertest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(applicationcontrollertest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(tripgrouptest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(locationinformationtest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(timelinemodeltest.cpp modelverificationpoint.cpp TEST_NAME timelinemodeltest LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(tripgroupproxytest.cpp modelverificationpoint.cpp TEST_NAME tripgroupproxytest LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(tripgroupinfoprovidertest.cpp TEST_NAME tripgroupinfoprovidertest LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(publictransporttest.cpp TEST_NAME publictransporttest LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(timelinedelegatecontrollertest.cpp TEST_NAME timelinedelegatecontrollertest LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(documentmanagertest.cpp TEST_NAME documentmanagertest LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(statisticstest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(favoritelocationtest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(transfertest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(livedatamanagertest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(healthcertificatemanagertest.cpp LINK_LIBRARIES Qt5::Test itinerary)
ecm_add_test(pkpassmanagertest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(reservationmanagertest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(applicationcontrollertest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(tripgrouptest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(locationinformationtest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(timelinemodeltest.cpp modelverificationpoint.cpp TEST_NAME timelinemodeltest LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(tripgroupproxytest.cpp modelverificationpoint.cpp TEST_NAME tripgroupproxytest LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(tripgroupinfoprovidertest.cpp TEST_NAME tripgroupinfoprovidertest LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(publictransporttest.cpp TEST_NAME publictransporttest LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(timelinedelegatecontrollertest.cpp TEST_NAME timelinedelegatecontrollertest LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(documentmanagertest.cpp TEST_NAME documentmanagertest LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(statisticstest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(favoritelocationtest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(transfertest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(livedatamanagertest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(healthcertificatemanagertest.cpp LINK_LIBRARIES Qt::Test itinerary)
ecm_add_test(weathertest.cpp LINK_LIBRARIES Qt5::Test itinerary-weather)
ecm_add_test(weathertest.cpp LINK_LIBRARIES Qt::Test itinerary-weather)
target_include_directories(weathertest PRIVATE ${CMAKE_BINARY_DIR})
......@@ -57,8 +57,8 @@ target_link_libraries(itinerary PUBLIC
KF5::Contacts
KF5::CoreAddons
KF5::Notifications
Qt5::Network
Qt5::Quick
Qt::Network
Qt::Quick
)
if (TARGET KHealthCertificate)
target_link_libraries(itinerary PRIVATE KHealthCertificate)
......@@ -88,18 +88,18 @@ target_include_directories(itinerary-app PRIVATE ${CMAKE_BINARY_DIR})
target_link_libraries(itinerary-app PRIVATE
itinerary
KOSMIndoorMap
Qt5::QuickControls2
Qt::QuickControls2
)
if (ANDROID)
target_include_directories(itinerary-app PRIVATE ${Qt5Core_PRIVATE_INCLUDE_DIRS})
# explicitly add runtime dependencies and transitive link dependencies,
# so androiddeployqt picks them up
target_link_libraries(itinerary PUBLIC Qt5::AndroidExtras KAndroidExtras)
target_link_libraries(itinerary PUBLIC Qt::AndroidExtras KAndroidExtras)
target_link_libraries(itinerary-app PRIVATE
KF5::Mime
KF5::Archive
KF5::Kirigami2
Qt5::Svg
Qt::Svg
KF5::Prison
OpenSSL::SSL
)
......@@ -181,10 +181,10 @@ if (ANDROID)
weather-storm
)
else ()
target_link_libraries(itinerary PRIVATE Qt5::Positioning Qt5::DBus Qt5::Widgets)
target_link_libraries(itinerary PRIVATE Qt::Positioning Qt::DBus Qt::Widgets)
target_link_libraries(itinerary-app PRIVATE
KF5::DBusAddons
Qt5::Widgets
Qt::Widgets
)
set_target_properties(itinerary-app PROPERTIES OUTPUT_NAME "itinerary")
endif()
......
......@@ -6,4 +6,4 @@ add_library(GpxIo STATIC
gpxwriter.cpp
)
target_include_directories(GpxIo PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>")
target_link_libraries(GpxIo PUBLIC Qt5::Core)
target_link_libraries(GpxIo PUBLIC Qt::Core)
......@@ -22,10 +22,10 @@ if (NOT ANDROID)
endif()
generate_export_header(KAndroidExtras BASE_NAME KAndroidExtras)
target_link_libraries(KAndroidExtras PUBLIC Qt5::Core)
target_link_libraries(KAndroidExtras PUBLIC Qt::Core)
if (ANDROID)
target_link_libraries(KAndroidExtras PUBLIC Qt5::AndroidExtras)
target_link_libraries(KAndroidExtras PUBLIC Qt::AndroidExtras)
else()
target_include_directories(KAndroidExtras PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/fake)
endif()
......
......@@ -22,9 +22,9 @@ else()
solidlockbackend.cpp
networkstatus_dbus.cpp
)
qt5_add_dbus_interface(solidextras_srcs org.kde.Solid.PowerManagement.Actions.BrightnessControl.xml brightnesscontroldbusinterface)
qt5_add_dbus_interface(solidextras_srcs org.freedesktop.ScreenSaver.xml screensaverdbusinterface)
qt5_add_dbus_interface(solidextras_srcs org.freedesktop.portal.NetworkMonitor.xml portalnetworkmonitor)
qt_add_dbus_interface(solidextras_srcs org.kde.Solid.PowerManagement.Actions.BrightnessControl.xml brightnesscontroldbusinterface)
qt_add_dbus_interface(solidextras_srcs org.freedesktop.ScreenSaver.xml screensaverdbusinterface)
qt_add_dbus_interface(solidextras_srcs org.freedesktop.portal.NetworkMonitor.xml portalnetworkmonitor)
endif()
add_library(SolidExtras ${solidextras_srcs})
......@@ -36,12 +36,12 @@ endif()
configure_file(config-solid-extras.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-solid-extras.h)
target_include_directories(SolidExtras PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>")
target_link_libraries(SolidExtras PUBLIC Qt5::Core)
target_link_libraries(SolidExtras PUBLIC Qt::Core)
if (ANDROID)
target_link_libraries(SolidExtras PRIVATE Qt5::AndroidExtras)
target_link_libraries(SolidExtras PRIVATE Qt::AndroidExtras)
else ()
target_link_libraries(SolidExtras PRIVATE Qt5::DBus)
target_link_libraries(SolidExtras PRIVATE Qt::DBus)
if (TARGET KF5::NetworkManagerQt)
target_link_libraries(SolidExtras PRIVATE KF5::NetworkManagerQt)
endif()
......
......@@ -3,7 +3,7 @@
add_library(solidextrasqmlplugin solidextrasqmlplugin.cpp)
target_link_libraries(solidextrasqmlplugin
Qt5::Qml
Qt::Qml
SolidExtras
)
......
......@@ -14,9 +14,9 @@ target_sources(itinerary-weather PRIVATE
target_link_libraries(itinerary-weather
PUBLIC
Qt5::Core
Qt::Core
PRIVATE
Qt5::Network
Qt::Network
ZLIB::ZLIB
)
if (TARGET KF5::Holidays)
......
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