Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) (#69)
* Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
* Add missing Qt5 includes
commit87aa3950875c9cb614b33919dea08ae3ca16585b
authorIvan Semkin <ivan@semkin.ru>
dateWed 19 Sep 2018, 10:19 (8 years ago)
parent5778309
CMakeLists.txt+3
@@ -70,6 +70,9 @@ find_package(Qt5DBus 5.6 REQUIRED)
7070find_package(Qt5Concurrent 5.6 REQUIRED)
7171find_package(Qt5Sql 5.6 REQUIRED)
7272find_package(Qt5Test 5.6 REQUIRED)
73+find_package(Qt5Svg 5.6 REQUIRED)
74+find_package(Qt5Network 5.6 REQUIRED)
75+find_package(Qt5Xml 5.6 REQUIRED)
7376
7477pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
7578pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
plugins/AccountsService/CMakeLists.txt+1−2
@@ -7,9 +7,8 @@ add_library(AccountsService-qml MODULE
77 plugin.cpp
88 )
99
10−qt5_use_modules(AccountsService-qml DBus Qml)
11−
1210target_link_libraries(AccountsService-qml
11+ Qt5::DBus Qt5::Qml
1312 ${GLIB_LIBRARIES}
1413 )
1514
plugins/Cursor/CMakeLists.txt+1−2
@@ -26,8 +26,7 @@ add_library(Cursor-qml SHARED
2626target_link_libraries(Cursor-qml
2727 xcursorloader-static
2828 ${QT5PLATFORM_SUPPORT_LDFLAGS}
29+ Qt5::Qml Qt5::Quick Qt5::Svg
2930)
3031
31−qt5_use_modules(Cursor-qml Qml Quick Svg)
32−
3332add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)
plugins/Dash/CMakeLists.txt+1−2
@@ -37,10 +37,9 @@ add_library(Dash-qml MODULE
3737target_link_libraries(Dash-qml
3838 ${Qt5Gui_LIBRARIES}
3939 ${Qt5Quick_LIBRARIES}
40+ Qt5::Qml Qt5::Quick Qt5::Concurrent
4041 )
4142
42−qt5_use_modules(Dash-qml Qml Quick Concurrent)
43−
4443add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
4544
4645install(FILES graphics/music_progress_bg.png DESTINATION ${SHELL_INSTALL_QML}/Dash/graphics/)
plugins/GlobalShortcut/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(globalshortcutplugin_SRCS
55
66add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})
77
8−qt5_use_modules(GlobalShortcut-qml Quick Gui)
8+target_link_libraries(GlobalShortcut-qml Qt5::Quick Qt5::Gui)
99
1010add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)
plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−2
@@ -29,8 +29,7 @@ add_library(UnityLauncherAS-qml MODULE
2929target_link_libraries(UnityLauncherAS-qml
3030 unity8-private
3131 ${GSETTINGS_QT_LDFLAGS}
32+ Qt5::DBus Qt5::Qml Qt5::Gui
3233 )
3334
34−qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)
35−
3635add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)
plugins/ImageCache/CMakeLists.txt+1−1
@@ -3,6 +3,6 @@ add_library(ImageCache-qml MODULE
33 plugin.cpp
44 )
55
6−qt5_use_modules(ImageCache-qml Gui Qml Quick)
6+target_link_libraries(ImageCache-qml Qt5::Gui Qt5::Qml Qt5::Quick)
77
88add_unity8_plugin(ImageCache 0.1 ImageCache TARGETS ImageCache-qml)
plugins/LightDM/FullLightDM/CMakeLists.txt+1−1
@@ -26,7 +26,7 @@ target_link_libraries(FullLightDM-qml
2626 unity8-private
2727 ${LIBLIGHTDM_LDFLAGS}
2828 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
29+ Qt5::DBus Qt5::Gui Qt5::Qml
2930 )
3031
31−qt5_use_modules(FullLightDM-qml DBus Gui Qml)
3232add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)
plugins/LightDM/IntegratedLightDM/CMakeLists.txt+1−1
@@ -25,9 +25,9 @@ target_link_libraries(IntegratedLightDM-qml
2525 integratedLightDM
2626 unity8-private
2727 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
28+ Qt5::DBus Qt5::Gui Qt5::Qml
2829 )
2930
30−qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
3131add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
3232
3333add_subdirectory(liblightdm)
plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt+3−4
@@ -26,22 +26,21 @@ target_link_libraries(integratedLightDM
2626 ${GLIB_LIBRARIES}
2727 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
2828 -lpam
29+ Qt5::Concurrent Qt5::DBus Qt5::Gui
2930)
3031target_link_libraries(integratedLightDMSession
3132 ${GLIB_LIBRARIES}
3233 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
3334 -lpam
35+ Qt5::Concurrent Qt5::DBus Qt5::Gui
3436)
3537target_link_libraries(MockLightDM-demo-shared
3638 ${GLIB_LIBRARIES}
3739 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
3840 -lpam
41+ Qt5::Concurrent Qt5::DBus Qt5::Gui
3942)
4043
41−qt5_use_modules(integratedLightDM Concurrent DBus Gui)
42−qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)
43−qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)
44−
4544set_target_properties(integratedLightDM PROPERTIES
4645 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
4746set_target_properties(integratedLightDMSession PROPERTIES
plugins/Lights/CMakeLists.txt+4−2
@@ -11,7 +11,9 @@ add_library(Lights-qml MODULE
1111 Lights.cpp
1212 )
1313
14−qt5_use_modules(Lights-qml Qml Gui)
15−target_link_libraries(Lights-qml ${ANDROID_HARDWARE_LIBRARIES})
14+target_link_libraries(Lights-qml
15+ Qt5::Qml Qt5::Gui
16+ ${ANDROID_HARDWARE_LIBRARIES}
17+ )
1618
1719add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
plugins/Powerd/CMakeLists.txt+4−2
@@ -9,7 +9,9 @@ add_library(Powerd-qml MODULE
99 Powerd.cpp
1010 )
1111
12−qt5_use_modules(Powerd-qml DBus Qml)
13−target_link_libraries(Powerd-qml ${GIO_LDFLAGS})
12+target_link_libraries(Powerd-qml
13+ Qt5::DBus Qt5::Qml
14+ ${GIO_LDFLAGS}
15+ )
1416
1517add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
plugins/ScreenshotDirectory/CMakeLists.txt+1−1
@@ -4,6 +4,6 @@ set(PLUGIN_SOURCES
44)
55
66add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})
7−qt5_use_modules(ScreenshotDirectory-qml Qml Gui Quick)
7+target_link_libraries(ScreenshotDirectory-qml Qt5::Qml Qt5::Gui Qt5::Quick)
88
99add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)
plugins/SessionBroadcast/CMakeLists.txt+1−2
@@ -6,9 +6,8 @@ add_library(SessionBroadcast-qml MODULE
66 plugin.cpp
77 )
88
9−qt5_use_modules(SessionBroadcast-qml DBus Qml)
10−
119target_link_libraries(SessionBroadcast-qml
10+ Qt5::DBus Qt5::Qml
1211 ${GLIB_LIBRARIES}
1312 )
1413
plugins/UInput/CMakeLists.txt+1−1
@@ -3,5 +3,5 @@ add_library(UInput-qml MODULE
33 uinput.cpp
44)
55
6−qt5_use_modules(UInput-qml Qml)
6+target_link_libraries(UInput-qml Qt5::Qml)
77add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+4−2
@@ -11,8 +11,10 @@ set(DOWNLOADDAEMONLISTENER_SOURCES
1111
1212add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
1313
14−qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
1514pkg_check_modules(DDLADAPTER REQUIRED udm-common)
1615add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
17−target_link_libraries(DownloadDaemonListener ${DDLADAPTER_LIBRARIES})
16+target_link_libraries(DownloadDaemonListener
17+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Core
18+ ${DDLADAPTER_LIBRARIES}
19+ )
1820add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
plugins/Ubuntu/Gestures/CMakeLists.txt+1−3
@@ -17,9 +17,7 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
1717add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
1818
1919add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})
20−target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
21−
22−qt5_use_modules(UbuntuGesturesQml Core Quick)
20+target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES} Qt5::Core Qt5::Quick)
2321
2422# So that Foo.cpp can #include "Foo.moc"
2523include_directories(${CMAKE_CURRENT_BINARY_DIR})
plugins/Unity/ApplicationMenu/CMakeLists.txt+1−1
@@ -14,6 +14,6 @@ qt5_add_dbus_adaptor(applicationMenu_SRCS com.ubuntu.MenuRegistrar.xml dbusappli
1414
1515add_library(ApplicationMenu-qml MODULE ${applicationMenu_SRCS})
1616
17−qt5_use_modules(ApplicationMenu-qml DBus Qml)
17+target_link_libraries(ApplicationMenu-qml Qt5::DBus Qt5::Qml)
1818
1919add_unity8_plugin(Unity.ApplicationMenu 0.1 Unity/ApplicationMenu TARGETS ApplicationMenu-qml)
plugins/Unity/Connectivity/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(CONNECTIVITY_SOURCES
55
66add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
77
8−qt5_use_modules(Connectivity Qml DBus Core)
8+target_link_libraries(Connectivity Qt5::Qml Qt5::DBus Qt5::Core)
99
1010add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
plugins/Unity/DashCommunicator/CMakeLists.txt+1−2
@@ -16,9 +16,8 @@ add_library(DashCommunicator-qml MODULE
1616 ${QMLDASHCOMMUNICATORPLUGIN_SRC}
1717)
1818
19−qt5_use_modules(DashCommunicator-qml DBus Qml)
20−
2119target_link_libraries(DashCommunicator-qml
20+ Qt5::DBus Qt5::Qml
2221 unity8-private
2322)
2423
plugins/Unity/Indicators/CMakeLists.txt+1−2
@@ -44,8 +44,7 @@ target_link_libraries(IndicatorsQml
4444 ${GLIB_LIBRARIES}
4545 ${GIO_LIBRARIES}
4646 ${QMENUMODEL_LDFLAGS}
47+ Qt5::Core Qt5::Qml Qt5::Quick Qt5::DBus
4748)
4849
49−qt5_use_modules(IndicatorsQml Core Qml Quick DBus)
50−
5150add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
plugins/Unity/InputInfo/CMakeLists.txt+1−2
@@ -32,8 +32,7 @@ add_library(InputInfo SHARED
3232target_link_libraries(InputInfo
3333 ${LIBUDEV_LDFLAGS}
3434 ${LIBEVDEV_LDFLAGS}
35+ Qt5::Core Qt5::Qml Qt5::Quick
3536)
3637
37−qt5_use_modules(InputInfo Core Qml Quick)
38−
3938add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)
plugins/Unity/Launcher/CMakeLists.txt+1−2
@@ -47,8 +47,7 @@ target_link_libraries(UnityLauncher-qml
4747 ${GSETTINGS_QT_LDFLAGS}
4848 ${GLIB_LIBRARIES}
4949 ${UAL_LIBRARIES}
50+ Qt5::DBus Qt5::Qml Qt5::Gui
5051 )
5152
52−qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
53−
5453add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Platform/CMakeLists.txt+1−1
@@ -6,6 +6,6 @@ set(platformplugin_SRCS
66
77add_library(Platform-qml SHARED ${platformplugin_SRCS})
88
9−qt5_use_modules(Platform-qml DBus Qml)
9+target_link_libraries(Platform-qml Qt5::DBus Qt5::Qml)
1010
1111add_unity8_plugin(Unity.Platform 1.0 Unity/Platform TARGETS Platform-qml)
plugins/Unity/Session/CMakeLists.txt+1−1
@@ -18,8 +18,8 @@ add_library(UnitySession-qml MODULE
1818 ${QMLSESSIONPLUGIN_SRC}
1919 )
2020
21−qt5_use_modules(UnitySession-qml DBus Qml)
2221target_link_libraries(UnitySession-qml
22+ Qt5::DBus Qt5::Qml
2323 unity8-private
2424 ${GIO_LDFLAGS}
2525 ${GLIB_LIBRARIES}
plugins/Utils/CMakeLists.txt+4−3
@@ -44,7 +44,10 @@ add_library(Utils-qml SHARED
4444 ${QMLPLUGIN_SRC}
4545 )
4646
47−target_link_libraries(Utils-qml ${GIO_LDFLAGS})
47+target_link_libraries(Utils-qml
48+ ${GIO_LDFLAGS}
49+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui Qt5::Sql Qt5::Concurrent
50+ )
4851
4952# Because this is an internal support library, we want
5053# to expose all symbols in it. Consider changing this
@@ -52,6 +55,4 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})
5255# files directly in targets.
5356set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
5457
55−qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)
56−
5758add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
plugins/WindowManager/CMakeLists.txt+1−1
@@ -20,6 +20,6 @@ include_directories(
2020
2121add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
2222
23−qt5_use_modules(windowmanager-qml Qml Quick Gui)
23+target_link_libraries(windowmanager-qml Qt5::Qml Qt5::Quick Qt5::Gui)
2424
2525add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)
plugins/Wizard/CMakeLists.txt+4−2
@@ -12,8 +12,10 @@ add_library(Wizard-qml MODULE
1212 keyboardLayoutsModel.cpp
1313)
1414
15−qt5_use_modules(Wizard-qml DBus Qml)
16−target_link_libraries(Wizard-qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
15+target_link_libraries(Wizard-qml
16+ Qt5::DBus Qt5::Qml
17+ ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS}
18+)
1719add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
1820
1921set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
plugins/Wizard/Utils/CMakeLists.txt+1−1
@@ -20,7 +20,7 @@ add_library(WizardUtils-qml SHARED
2020# files directly in targets.
2121set_target_properties(WizardUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
2222
23−qt5_use_modules(WizardUtils-qml DBus Qml Quick)
23+target_link_libraries(WizardUtils-qml Qt5::DBus Qt5::Qml Qt5::Quick)
2424
2525set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Wizard/Utils)
2626install(FILES qmldir DESTINATION ${PLUG_DIR})
src/CMakeLists.txt+5−2
@@ -44,12 +44,15 @@ endif()
4444
4545pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
4646add_executable(${SHELL_APP} ${SOURCE_FILES})
47−qt5_use_modules(${SHELL_APP} DBus Gui Qml Quick Test)
4847
4948if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
5049 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
5150endif()
52−target_link_libraries(${SHELL_APP} ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS} UbuntuGestures connectivity-qt1 unity8-private)
51+target_link_libraries(${SHELL_APP}
52+ Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test
53+ ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS}
54+ UbuntuGestures connectivity-qt1 unity8-private
55+ )
5356
5457if (ENABLE_TOUCH_EMULATION)
5558 target_link_libraries(${SHELL_APP} ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
src/Dash/CMakeLists.txt+4−3
@@ -10,12 +10,13 @@ endif()
1010
1111add_executable(unity8-dash ${DASH_SRCS})
1212
13−qt5_use_modules(unity8-dash DBus Gui Qml Quick Test)
14−
1513# For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
1614set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
1715
18−target_link_libraries(unity8-dash UbuntuGestures connectivity-qt1)
16+target_link_libraries(unity8-dash
17+ Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test
18+ UbuntuGestures connectivity-qt1
19+)
1920
2021if (ENABLE_TOUCH_EMULATION)
2122 target_link_libraries(unity8-dash ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
src/libunity8-private/CMakeLists.txt+1−1
@@ -19,7 +19,7 @@ set_target_properties(${LIB_NAME} PROPERTIES
1919 SOVERSION ${SOVERSION}
2020 )
2121
22−qt5_use_modules(${LIB_NAME} DBus)
22+target_link_libraries(${LIB_NAME} Qt5::DBus)
2323
2424# install library
2525install(TARGETS ${LIB_NAME}
tests/mocks/AccountsService/CMakeLists.txt+1−2
@@ -14,9 +14,8 @@ add_library(MockAccountsService-qml MODULE
1414 plugin.cpp
1515 )
1616
17−qt5_use_modules(MockAccountsService-qml DBus Qml)
18−
1917target_link_libraries(MockAccountsService-qml
18+ Qt5::DBus Qt5::Qml
2019 MockLightDM
2120 )
2221
tests/mocks/Biometryd/CMakeLists.txt+1−1
@@ -9,6 +9,6 @@ set(MOCK_BIOMETRYD_SOURCES
99
1010add_library(MockBiometryd MODULE ${MOCK_BIOMETRYD_SOURCES})
1111
12−qt5_use_modules(MockBiometryd Qml Quick Core)
12+target_link_libraries(MockBiometryd Qt5::Qml Qt5::Quick Qt5::Core)
1313
1414add_unity8_mock(Biometryd 0.0 Biometryd TARGETS MockBiometryd)
tests/mocks/GSettings.1.0/CMakeLists.txt+1−2
@@ -13,8 +13,7 @@ add_library(FakeGSettingsQml MODULE ${GSettingsQML_SOURCES})
1313target_link_libraries(FakeGSettingsQml
1414 ${Qt5Core_LIBRARIES}
1515 ${Qt5Quick_LIBRARIES}
16+ Qt5::Qml
1617)
1718
18−qt5_use_modules(FakeGSettingsQml Qml)
19−
2019add_unity8_mock(GSettings 1.0 GSettings.1.0 TARGETS FakeGSettingsQml)
tests/mocks/LightDMController/CMakeLists.txt+1−2
@@ -8,8 +8,7 @@ target_include_directories(LightDMController PUBLIC
88
99target_link_libraries(LightDMController
1010 MockLightDM
11+ Qt5::Qml
1112 )
1213
13−qt5_use_modules(LightDMController Qml)
14−
1514add_unity8_mock(LightDMController 0.1 LightDMController TARGETS LightDMController)
tests/mocks/Lights/CMakeLists.txt+1−1
@@ -3,6 +3,6 @@ add_library(MockLights-qml MODULE
33 Lights.cpp
44 )
55
6−qt5_use_modules(MockLights-qml Qml Gui)
6+target_link_libraries(MockLights-qml Qt5::Qml Qt5::Gui)
77
88add_unity8_mock(Lights 0.1 Lights TARGETS MockLights-qml)
tests/mocks/MeeGo/QOfono/CMakeLists.txt+1−1
@@ -6,6 +6,6 @@ set(MOCK_QOFONO_SOURCES
66
77add_library(MockQOfono MODULE ${MOCK_QOFONO_SOURCES})
88
9−qt5_use_modules(MockQOfono Qml Quick Core)
9+target_link_libraries(MockQOfono Qt5::Qml Qt5::Quick Qt5::Core)
1010
1111add_unity8_mock(MeeGo.QOfono 0.2 MeeGo/QOfono TARGETS MockQOfono)
tests/mocks/Powerd/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ add_library(MockPowerd-qml MODULE
55 Powerd.cpp
66 )
77
8−qt5_use_modules(MockPowerd-qml Qml)
8+target_link_libraries(MockPowerd-qml Qt5::Qml)
99
1010add_unity8_mock(Powerd 0.1 Powerd TARGETS MockPowerd-qml)
tests/mocks/QMenuModel/CMakeLists.txt+1−2
@@ -15,10 +15,9 @@ add_library(QMenuModelQml SHARED ${QMenuModelQml_SOURCES})
1515target_link_libraries(QMenuModelQml
1616 ${Qt5Core_LIBRARIES}
1717 ${Qt5Quick_LIBRARIES}
18+ Qt5::Core Qt5::Quick
1819)
1920
20−qt5_use_modules(QMenuModelQml Core Quick)
21−
2221set_target_properties(QMenuModelQml PROPERTIES
2322 OUTPUT_NAME qmenumodel
2423 VERSION 0)
tests/mocks/QtMultimedia/CMakeLists.txt+1−1
@@ -10,6 +10,6 @@ add_library(QtMultimedia-qml MODULE
1010 declarativeplaylist.cpp
1111 )
1212
13−qt5_use_modules(QtMultimedia-qml Qml Quick)
13+target_link_libraries(QtMultimedia-qml Qt5::Qml Qt5::Quick)
1414
1515add_unity8_mock(QtMultimedia 5.0 QtMultimedia TARGETS QtMultimedia-qml)
tests/mocks/SessionBroadcast/CMakeLists.txt+1−1
@@ -3,6 +3,6 @@ add_library(MockSessionBroadcast-qml MODULE
33 SessionBroadcast.cpp
44 )
55
6−qt5_use_modules(MockSessionBroadcast-qml Qml)
6+target_link_libraries(MockSessionBroadcast-qml Qt5::Qml)
77
88add_unity8_mock(SessionBroadcast 0.1 SessionBroadcast TARGETS MockSessionBroadcast-qml)
tests/mocks/UInput/CMakeLists.txt+1−1
@@ -3,5 +3,5 @@ add_library(FakeUInput-qml MODULE
33 mockuinput.cpp
44)
55
6−qt5_use_modules(FakeUInput-qml Qml)
6+target_link_libraries(FakeUInput-qml Qt5::Qml)
77add_unity8_mock(UInput 0.1 UInput TARGETS FakeUInput-qml)
tests/mocks/Ubuntu/Connectivity/CMakeLists.txt+1−1
@@ -2,7 +2,7 @@ add_library(connectivity-qml SHARED
22 networking-status.cpp
33 plugin.cpp
44)
5−qt5_use_modules(connectivity-qml Qml)
5+target_link_libraries(connectivity-qml Qt5::Qml)
66
77# copy qmldir file into build directory for shadow builds
88file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(FakeUbuntuDownloadDaemonListenerQml_SOURCES
55
66add_library(FakeUbuntuDownloadDaemonListenerQml MODULE ${FakeUbuntuDownloadDaemonListenerQml_SOURCES})
77
8−qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
8+target_link_libraries(FakeUbuntuDownloadDaemonListenerQml Qt5::Core Qt5::Quick)
99
1010add_unity8_mock(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS FakeUbuntuDownloadDaemonListenerQml)
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(MOCK_SECURITYPRIVACY_SOURCES
55
66add_library(MockSecurityPrivacy MODULE ${MOCK_SECURITYPRIVACY_SOURCES})
77
8−qt5_use_modules(MockSecurityPrivacy Qml Quick Core)
8+target_link_libraries(MockSecurityPrivacy Qt5::Qml Qt5::Quick Qt5::Core)
99
1010add_unity8_mock(Ubuntu.SystemSettings.SecurityPrivacy 1.0 Ubuntu/SystemSettings/SecurityPrivacy TARGETS MockSecurityPrivacy)
tests/mocks/Ubuntu/Telephony/CMakeLists.txt+1−1
@@ -9,6 +9,6 @@ set(FakeUbuntuTelephonyQml_SOURCES
99
1010add_library(FakeUbuntuTelephonyQml MODULE ${FakeUbuntuTelephonyQml_SOURCES})
1111
12−qt5_use_modules(FakeUbuntuTelephonyQml Core Quick)
12+target_link_libraries(FakeUbuntuTelephonyQml Qt5::Core Qt5::Quick)
1313
1414add_unity8_mock(Ubuntu.Telephony 0.1 Ubuntu/Telephony TARGETS FakeUbuntuTelephonyQml)
tests/mocks/Unity/Application/CMakeLists.txt+2−2
@@ -24,8 +24,8 @@ add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
2424add_library(NonMirUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
2525set_target_properties(NonMirUnityApplicationQml PROPERTIES OUTPUT_NAME FakeUnityApplicationQml)
2626
27−qt5_use_modules(FakeUnityApplicationQml Core Quick DBus)
28−qt5_use_modules(NonMirUnityApplicationQml Core Quick DBus)
27+target_link_libraries(FakeUnityApplicationQml Qt5::Core Qt5::Quick Qt5::DBus)
28+target_link_libraries(NonMirUnityApplicationQml Qt5::Core Qt5::Quick Qt5::DBus)
2929
3030add_unity8_mock(Unity.Application 0.1 Unity/Application TARGETS FakeUnityApplicationQml)
3131add_unity8_mock(Unity.Application 0.1 Unity/Application
tests/mocks/Unity/ApplicationMenu/CMakeLists.txt+1−1
@@ -13,6 +13,6 @@ set(FakeApplicationMenu_SRCS
1313
1414add_library(FakeApplicationMenu-qml MODULE ${FakeApplicationMenu_SRCS})
1515
16−qt5_use_modules(FakeApplicationMenu-qml Qml DBus)
16+target_link_libraries(FakeApplicationMenu-qml Qt5::Qml Qt5::DBus)
1717
1818add_unity8_mock(Unity.ApplicationMenu 1.0 Unity/ApplicationMenu PREFIX mocks TARGETS FakeApplicationMenu-qml)
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -67,7 +67,7 @@ target_link_libraries(FakeUnityQml
6767 ${GOBJECT_LDFLAGS}
6868)
6969
70−qt5_use_modules(FakeUnityQml Qml)
70+target_link_libraries(FakeUnityQml Qt5::Qml)
7171
7272add_unity8_mock(Unity 0.2 Unity TARGETS FakeUnityQml)
7373
tests/mocks/Unity/Connectivity/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(MOCK_CONNECTIVITY_SOURCES
55
66add_library(MockConnectivity MODULE ${MOCK_CONNECTIVITY_SOURCES})
77
8−qt5_use_modules(MockConnectivity Qml Quick Core)
8+target_link_libraries(MockConnectivity Qt5::Qml Qt5::Quick Qt5::Core)
99
1010add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
tests/mocks/Unity/DashCommunicator/CMakeLists.txt+1−1
@@ -12,7 +12,7 @@ add_library(MockDashCommunicator-qml MODULE
1212 ${QMLDASHCOMMUNICATORPLUGIN_SRC}
1313 )
1414
15−qt5_use_modules(MockDashCommunicator-qml DBus Qml)
15+target_link_libraries(MockDashCommunicator-qml Qt5::DBus Qt5::Qml)
1616
1717# export the qmldir and qmltypes files
1818add_unity8_mock(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS MockDashCommunicator-qml)
tests/mocks/Unity/Indicators/CMakeLists.txt+1−2
@@ -29,12 +29,11 @@ add_definitions(-DUNITYINDICATORS_LIBRARY)
2929
3030target_link_libraries(IndicatorsFakeQml
3131 QMenuModelQml
32+ Qt5::Core Qt5::Qml Qt5::Quick
3233)
3334
3435set_target_properties(IndicatorsFakeQml PROPERTIES
3536 INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks/QMenuModel"
3637)
3738
38−qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
39−
4039add_unity8_mock(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsFakeQml)
tests/mocks/Unity/InputInfo/CMakeLists.txt+1−1
@@ -26,6 +26,6 @@ add_library(MockInputInfo SHARED
2626 ${MockInputInfo_SOURCES}
2727)
2828
29−qt5_use_modules(MockInputInfo Core Qml Quick)
29+target_link_libraries(MockInputInfo Qt5::Core Qt5::Qml Qt5::Quick)
3030
3131add_unity8_mock(Unity.InputInfo 0.1 Unity/InputInfo TARGETS MockInputInfo)
tests/mocks/Unity/Launcher/CMakeLists.txt+1−1
@@ -19,6 +19,6 @@ set(MockLauncherModel_SOURCES
1919
2020add_library(MockLauncherPlugin MODULE ${MockLauncherModel_SOURCES})
2121
22−qt5_use_modules(MockLauncherPlugin Core Quick)
22+target_link_libraries(MockLauncherPlugin Qt5::Core Qt5::Quick)
2323
2424add_unity8_mock(Unity.Launcher 0.1 Unity/Launcher TARGETS MockLauncherPlugin)
tests/mocks/Unity/Notifications/CMakeLists.txt+1−1
@@ -11,6 +11,6 @@ set(MockNotificationsPlugin_SOURCES
1111
1212add_library(MockNotificationsPlugin MODULE ${MockNotificationsPlugin_SOURCES})
1313
14−qt5_use_modules(MockNotificationsPlugin Core Quick)
14+target_link_libraries(MockNotificationsPlugin Qt5::Core Qt5::Quick)
1515
1616add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications TARGETS MockNotificationsPlugin)
tests/mocks/Unity/Screens/CMakeLists.txt+1−1
@@ -9,6 +9,6 @@ set(MockScreens_SOURCES
99
1010add_library(MockScreensPlugin MODULE ${MockScreens_SOURCES})
1111
12−qt5_use_modules(MockScreensPlugin Gui Qml)
12+target_link_libraries(MockScreensPlugin Qt5::Gui Qt5::Qml)
1313
1414add_unity8_mock(Unity.Screens 0.1 Unity/Screens PREFIX mocks TARGETS MockScreensPlugin)
tests/mocks/Utils/CMakeLists.txt+4−3
@@ -47,7 +47,10 @@ add_library(FakeUtils-qml SHARED
4747 ${QMLPLUGIN_SRC}
4848 )
4949
50−target_link_libraries(FakeUtils-qml ${GIO_LDFLAGS})
50+target_link_libraries(FakeUtils-qml
51+ ${GIO_LDFLAGS}
52+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui
53+ )
5154
5255# Because this is an internal support library, we want
5356# to expose all symbols in it. Consider changing this
@@ -55,6 +58,4 @@ target_link_libraries(FakeUtils-qml ${GIO_LDFLAGS})
5558# files directly in targets.
5659set_target_properties(FakeUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
5760
58−qt5_use_modules(FakeUtils-qml Qml Quick DBus Network Gui)
59−
6061add_unity8_mock(Utils 0.1 Utils TARGETS FakeUtils-qml)
tests/mocks/Wizard/CMakeLists.txt+1−2
@@ -15,6 +15,5 @@ add_library(MockWizard-qml MODULE
1515 ${CMAKE_SOURCE_DIR}/plugins/Wizard/keyboardLayoutsModel.cpp
1616)
1717
18−qt5_use_modules(MockWizard-qml DBus Qml)
19−target_link_libraries(MockWizard-qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
18+target_link_libraries(MockWizard-qml Qt5::DBus Qt5::Qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
2019add_unity8_mock(Wizard 0.1 Wizard TARGETS MockWizard-qml)
tests/mocks/liblightdm/CMakeLists.txt+1−1
@@ -7,7 +7,7 @@ set(MockLightDM_SOURCES
77
88add_library(MockLightDM SHARED ${MockLightDM_SOURCES})
99
10−qt5_use_modules(MockLightDM DBus Gui)
10+target_link_libraries(MockLightDM Qt5::DBus Qt5::Gui)
1111
1212set_target_properties(MockLightDM PROPERTIES
1313 OUTPUT_NAME lightdm-qt5-3
tests/mocks/liblightdm/demo/CMakeLists.txt+1−1
@@ -18,4 +18,4 @@ target_link_libraries(MockLightDM-demo
1818 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
1919 )
2020
21−qt5_use_modules(MockLightDM-demo Gui)
21+target_link_libraries(MockLightDM-demo Qt5::Gui)
tests/mocks/libusermetrics/CMakeLists.txt+1−1
@@ -6,7 +6,7 @@ set(mock_SOURCES
66
77add_library(MockUserMetrics SHARED ${mock_SOURCES})
88
9−qt5_use_modules(MockUserMetrics Gui)
9+target_link_libraries(MockUserMetrics Qt5::Gui)
1010
1111include_directories(
1212 ${CMAKE_SOURCE_DIR}/plugins/Utils
tests/plugins/AccountsService/CMakeLists.txt+2−2
@@ -40,7 +40,7 @@ add_executable(mock-server
4040 PropertiesServer.cpp
4141 UscServer.cpp
4242 )
43−qt5_use_modules(mock-server Core DBus)
43+target_link_libraries(mock-server Qt5::Core Qt5::DBus)
4444install(TARGETS mock-server
4545 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/AccountsService"
4646)
@@ -50,7 +50,7 @@ add_executable(test-accountsservice
5050 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
5151 client.cpp
5252 )
53−qt5_use_modules(test-accountsservice Core DBus Test)
53+target_link_libraries(test-accountsservice Qt5::Core Qt5::DBus Qt5::Test)
5454install(TARGETS test-accountsservice
5555 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/AccountsService"
5656)
tests/plugins/Dash/CMakeLists.txt+4−8
@@ -32,8 +32,7 @@ macro(add_lvwph_test FILENAME TESTNAME)
3232 add_executable(${TESTNAME}TestExec
3333 ${FILENAME}test.cpp
3434 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/listviewwithpageheader.cpp)
35− qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
36− target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
35+ target_link_libraries(${TESTNAME}TestExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
3736 install(TARGETS ${TESTNAME}TestExec
3837 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
3938 )
@@ -51,8 +50,7 @@ macro(add_dashview_try_test FILENAME TESTNAME)
5150 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
5251 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
5352 )
54− qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
55− target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
53+ target_link_libraries(${TESTNAME}TestExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
5654 install(TARGETS ${TESTNAME}TestExec
5755 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
5856 )
@@ -64,8 +62,7 @@ macro(add_dashview_try_test FILENAME TESTNAME)
6462 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
6563 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
6664 )
67− qt5_use_modules(${TESTNAME}TryExec Test Core Qml)
68− target_link_libraries(${TESTNAME}TryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
65+ target_link_libraries(${TESTNAME}TryExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
6966 install(TARGETS ${TESTNAME}TryExec
7067 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
7168 )
@@ -84,8 +81,7 @@ endforeach()
8481
8582# CardCreator test
8683add_executable(CardCreatorTestExec cardcreatortest.cpp)
87−qt5_use_modules(CardCreatorTestExec Test Core Qml)
88−target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
84+target_link_libraries(CardCreatorTestExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
8985install(TARGETS CardCreatorTestExec
9086 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
9187)
tests/plugins/GlobalShortcut/CMakeLists.txt+1−2
@@ -6,8 +6,7 @@ include_directories(
66add_definitions(-DTEST_DIR="plugins/GlobalShortcut")
77
88add_executable(GlobalShortcutTestExec GlobalShortcutTest.cpp ${CMAKE_SOURCE_DIR}/plugins/GlobalShortcut/globalshortcut.cpp)
9−qt5_use_modules(GlobalShortcutTestExec Test Quick)
10−target_link_libraries(GlobalShortcutTestExec ${Qt5Quick_LIBRARIES} GlobalShortcut-qml)
9+target_link_libraries(GlobalShortcutTestExec Qt5::Test Qt5::Quick ${Qt5Quick_LIBRARIES} GlobalShortcut-qml)
1110install(TARGETS GlobalShortcutTestExec
1211 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
1312)
tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−1
@@ -26,9 +26,9 @@ add_executable(launchermodelastestExec
2626target_link_libraries(launchermodelastestExec
2727 unity8-private
2828 ${GSETTINGS_QT_LDFLAGS}
29+ Qt5::Test Qt5::Core Qt5::DBus Qt5::Gui Qt5::Qml
2930 )
3031add_dependencies(launchermodelastestExec mock-server)
31−qt5_use_modules(launchermodelastestExec Test Core DBus Gui Qml)
3232install(TARGETS launchermodelastestExec
3333 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Greeter/Unity/Launcher"
3434)
tests/plugins/ImageCache/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ remove_definitions(-DQT_NO_KEYWORDS)
1414add_executable(ImageCacheTestExec
1515 test.cpp
1616 )
17−qt5_use_modules(ImageCacheTestExec Core Quick Test)
17+target_link_libraries(ImageCacheTestExec Qt5::Core Qt5::Quick Qt5::Test)
1818add_unity8_uitest(ImageCache ImageCacheTestExec
1919 DEPENDS ImageCache-qml
2020 IMPORT_PATHS ${UNITY_PLUGINPATH}
tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt+6−6
@@ -12,8 +12,8 @@ add_executable(GreeterDBusTestExec
1212# This add_dependencies is needed since we're linking with with -L and -l below
1313# make seems to work but ninja breaks without it
1414add_dependencies(GreeterDBusTestExec MockLightDM)
15−qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
1615target_link_libraries(GreeterDBusTestExec
16+ Qt5::Core Qt5::DBus Qt5::Quick Qt5::Test
1717 MockLightDM
1818 )
1919target_include_directories(GreeterDBusTestExec PUBLIC
@@ -36,8 +36,8 @@ add_executable(GreeterPamTestExec
3636 pam.cpp
3737 ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
3838 )
39−qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
4039target_link_libraries(GreeterPamTestExec
40+ Qt5::Concurrent Qt5::Core Qt5::Test
4141 integratedLightDM
4242 )
4343
@@ -57,8 +57,8 @@ add_executable(GreeterSessionsModelTestExec
5757 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
5858 )
5959add_dependencies(GreeterSessionsModelTestExec MockLightDM)
60−qt5_use_modules(GreeterSessionsModelTestExec Core Test)
6160target_link_libraries(GreeterSessionsModelTestExec
61+ Qt5::Core Qt5::Test
6262 MockLightDM
6363 )
6464target_include_directories(GreeterSessionsModelTestExec PUBLIC
@@ -84,8 +84,8 @@ add_executable(GreeterUsersModelTestExec
8484# This add_dependencies is needed since we're linking with with -L and -l below
8585# make seems to work but ninja breaks without it
8686add_dependencies(GreeterUsersModelTestExec MockLightDM)
87−qt5_use_modules(GreeterUsersModelTestExec Core Test)
8887target_link_libraries(GreeterUsersModelTestExec
88+ Qt5::Core Qt5::Test
8989 MockLightDM
9090 )
9191target_include_directories(GreeterUsersModelTestExec PUBLIC
@@ -111,8 +111,8 @@ add_executable(GreeterPromptsModelTestExec
111111# This add_dependencies is needed since we're linking with with -L and -l below
112112# make seems to work but ninja breaks without it
113113add_dependencies(GreeterPromptsModelTestExec MockLightDM)
114−qt5_use_modules(GreeterPromptsModelTestExec Core Test)
115114target_link_libraries(GreeterPromptsModelTestExec
115+ Qt5::Core Qt5::Test
116116 MockLightDM
117117 )
118118target_include_directories(GreeterPromptsModelTestExec PUBLIC
@@ -131,8 +131,8 @@ add_unity8_uitest(GreeterPrompts GreeterPromptsModelTestExec
131131add_executable(GreeterIntegratedTestExec
132132 integrated.cpp
133133 )
134−qt5_use_modules(GreeterIntegratedTestExec Core DBus Quick Test)
135134target_link_libraries(GreeterIntegratedTestExec
135+ Qt5::Core Qt5::DBus Qt5::Quick Qt5::Test
136136 ${GLIB_LIBRARIES}
137137 integratedLightDMSession
138138 )
tests/plugins/SessionBroadcast/CMakeLists.txt+2−2
@@ -24,7 +24,7 @@ add_executable(MockBroadcastServer
2424 server.cpp
2525 BroadcastServer.cpp
2626)
27−qt5_use_modules(MockBroadcastServer Core DBus)
27+target_link_libraries(MockBroadcastServer Qt5::Core Qt5::DBus)
2828install(TARGETS MockBroadcastServer
2929 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/SessionBroadcast"
3030)
@@ -34,7 +34,7 @@ add_executable(sessionbroadcasttestExec
3434 ${CMAKE_SOURCE_DIR}/plugins/SessionBroadcast/SessionBroadcast.cpp
3535 sessionbroadcasttest.cpp
3636)
37−qt5_use_modules(sessionbroadcasttestExec Test Core Qml DBus)
37+target_link_libraries(sessionbroadcasttestExec Qt5::Test Qt5::Core Qt5::Qml Qt5::DBus)
3838install(TARGETS sessionbroadcasttestExec
3939 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/SessionBroadcast"
4040)
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+4−2
@@ -18,8 +18,10 @@ include_directories(
1818
1919macro(build_gesture_test CLASSNAME)
2020 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)
21− qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
22− target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
21+ target_link_libraries(${CLASSNAME}TestExec
22+ Qt5::Test Qt5::Core Qt5::Qml Qt5::Gui Qt5::Quick
23+ UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES}
24+ )
2325 install(TARGETS ${CLASSNAME}TestExec
2426 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Ubuntu/Gestures"
2527 )
tests/plugins/Unity/Indicators/CMakeLists.txt+1−1
@@ -17,8 +17,8 @@ macro(indicator_test TEST)
1717 ${TEST}Test.cpp
1818 ${test_ADDITIONAL_CPPS}
1919 )
20− qt5_use_modules(${TEST}Exec Test Core Qml DBus)
2120 target_link_libraries(${TEST}Exec
21+ Qt5::Test Qt5::Core Qt5::Qml Qt5::DBus
2222 ${test_ADDITIONAL_LIBS}
2323 ${GLIB_LIBRARIES}
2424 ${GIO_LIBRARIES}
tests/plugins/Unity/Launcher/CMakeLists.txt+2−2
@@ -44,9 +44,9 @@ target_link_libraries(launchermodeltestExec
4444 ${GSETTINGS_QT_LDFLAGS}
4545 ${GLIB_LIBRARIES}
4646 ${UAL_LIBRARIES}
47+ Qt5::Test Qt5::Core Qt5::DBus Qt5::Xml Qt5::Gui Qt5::Qml
4748 )
4849add_dependencies(launchermodeltestExec mock-server)
49−qt5_use_modules(launchermodeltestExec Test Core DBus Xml Gui Qml)
5050install(TARGETS launchermodeltestExec
5151 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
5252 )
@@ -78,9 +78,9 @@ target_link_libraries(appdrawermodeltestExec
7878 ${GSETTINGS_QT_LDFLAGS}
7979 ${GLIB_LIBRARIES}
8080 ${UAL_LIBRARIES}
81+ Qt5::Test Qt5::Core Qt5::DBus Qt5::Xml Qt5::Gui Qt5::Qml
8182 )
8283add_dependencies(appdrawermodeltestExec mock-server)
83−qt5_use_modules(appdrawermodeltestExec Test Core DBus Xml Gui Qml)
8484install(TARGETS appdrawermodeltestExec
8585 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
8686 )
tests/plugins/Unity/Session/CMakeLists.txt+2−2
@@ -28,7 +28,7 @@ add_executable(LightDMServer
2828 LogindServer.cpp
2929 server.cpp
3030)
31−qt5_use_modules(LightDMServer Core DBus)
31+target_link_libraries(LightDMServer Qt5::Core Qt5::DBus)
3232install(TARGETS LightDMServer
3333 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Session"
3434 )
@@ -53,7 +53,7 @@ target_link_libraries(sessionbackendtestExec
5353 unity8-private
5454 ${GLIB_LIBRARIES}
5555 )
56−qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)
56+target_link_libraries(sessionbackendtestExec Qt5::Test Qt5::Core Qt5::Qml Qt5::DBus)
5757install(TARGETS sessionbackendtestExec
5858 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Session"
5959)
tests/plugins/Utils/CMakeLists.txt+2−4
@@ -16,8 +16,7 @@ foreach(util_test
1616 WindowStateStorage
1717)
1818 add_executable(${util_test}TestExec ${util_test}Test.cpp ModelTest.cpp)
19− qt5_use_modules(${util_test}TestExec Test Core Qml)
20− target_link_libraries(${util_test}TestExec Utils-qml)
19+ target_link_libraries(${util_test}TestExec Qt5::Test Qt5::Core Qt5::Qml Utils-qml)
2120 install(TARGETS ${util_test}TestExec
2221 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Utils"
2322 )
@@ -32,8 +31,7 @@ add_unity8_qmlunittest(. UtilsStyle)
3231
3332# URLDispatcher test needs dbus-test-runner because it claims a dbus name
3433add_executable(URLDispatcherTestExec URLDispatcherTest.cpp)
35−qt5_use_modules(URLDispatcherTestExec Test Core Qml)
36−target_link_libraries(URLDispatcherTestExec Utils-qml)
34+target_link_libraries(URLDispatcherTestExec Qt5::Test Qt5::Core Qt5::Qml Utils-qml)
3735install(TARGETS URLDispatcherTestExec
3836 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Utils"
3937)
tests/plugins/WindowManager/CMakeLists.txt+4−2
@@ -17,9 +17,11 @@ add_executable(TopLevelWindowModelTestExec
1717 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
1818 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
1919 )
20−qt5_use_modules(TopLevelWindowModelTestExec Test Core Gui Qml Quick)
2120
22−target_link_libraries(TopLevelWindowModelTestExec windowmanager-qml)
21+target_link_libraries(TopLevelWindowModelTestExec
22+ Qt5::Test Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick
23+ windowmanager-qml
24+)
2325
2426install(TARGETS TopLevelWindowModelTestExec
2527 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/WindowManager"
tests/plugins/Wizard/CMakeLists.txt+2−2
@@ -7,7 +7,7 @@ add_executable(tst-wizard-pagelist
77 tst_pagelist.cpp
88 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
99)
10−qt5_use_modules(tst-wizard-pagelist Core Qml Test)
10+target_link_libraries(tst-wizard-pagelist Qt5::Core Qt5::Qml Qt5::Test)
1111install(TARGETS tst-wizard-pagelist
1212 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Wizard"
1313)
@@ -17,7 +17,7 @@ add_executable(tst-wizard-system
1717 tst_system.cpp
1818 ${CMAKE_SOURCE_DIR}/plugins/Wizard/System.cpp
1919)
20−qt5_use_modules(tst-wizard-system Core DBus Qml Test)
20+target_link_libraries(tst-wizard-system Qt5::Core Qt5::DBus Qt5::Qml Qt5::Test)
2121install(TARGETS tst-wizard-system
2222 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Wizard"
2323)
tests/qmltests/Components/CMakeLists.txt+8−4
@@ -18,8 +18,10 @@ include_directories(
1818 )
1919
2020add_executable(DragHandleTestExec tst_DragHandle.cpp)
21−qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
22−target_link_libraries(DragHandleTestExec UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
21+target_link_libraries(DragHandleTestExec
22+ Qt5::Test Qt5::Core Qt5::Qml Qt5::Gui Qt5::Quick
23+ UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES}
24+ )
2325install(TARGETS DragHandleTestExec
2426 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/qmltests/Components"
2527 )
@@ -34,8 +36,10 @@ add_unity8_qmltest_data(. tst_DragHandle)
3436
3537########## tst_EdgeDragEvaluator
3638add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)
37−qt5_use_modules(EdgeDragEvaluatorTestExec Test Core Qml Gui Quick)
38−target_link_libraries(EdgeDragEvaluatorTestExec UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
39+target_link_libraries(EdgeDragEvaluatorTestExec
40+ Qt5::Test Qt5::Core Qt5::Qml Qt5::Gui Qt5::Quick
41+ UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES}
42+ )
3943install(TARGETS EdgeDragEvaluatorTestExec
4044 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/qmltests/Components"
4145 )
tests/uqmlscene/CMakeLists.txt+1−1
@@ -4,7 +4,6 @@ add_executable(uqmlscene
44 ${CMAKE_SOURCE_DIR}/src/DebuggingController.cpp
55 )
66
7−qt5_use_modules(uqmlscene Qml Quick Test DBus)
87pkg_check_modules(XCB REQUIRED xcb)
98
109include_directories(
@@ -25,6 +24,7 @@ if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
2524endif()
2625
2726target_link_libraries(uqmlscene
27+ Qt5::Qml Qt5::Quick Qt5::Test Qt5::DBus
2828 ${Qt5Qml_LIBRARIES}
2929 ${Qt5Quick_LIBRARIES}
3030 ${XCB_LDFLAGS}
tests/utils/modules/Unity/Test/CMakeLists.txt+1−3
@@ -27,7 +27,7 @@ if (ENABLE_TOUCH_EMULATION)
2727endif()
2828
2929add_library(UnityTestQml MODULE ${UnityTestQML_SOURCES})
30−target_link_libraries(UnityTestQml ${UBUNTUGESTURES_LIBRARIES})
30+target_link_libraries(UnityTestQml ${UBUNTUGESTURES_LIBRARIES} Qt5::Core Qt5::Quick Qt5::Test)
3131
3232if (ENABLE_TOUCH_EMULATION)
3333 target_link_libraries(UnityTestQml ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
@@ -36,6 +36,4 @@ endif()
3636# To find libUbuntuGestures.so
3737set_target_properties(UnityTestQml PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
3838
39−qt5_use_modules(UnityTestQml Core Quick Test)
40−
4139add_unity8_mock(Unity.Test 0.1 Unity/Test PREFIX utils TARGETS UnityTestQml)
tools/indicatorsclient/CMakeLists.txt+1−1
@@ -13,7 +13,7 @@ add_executable(${INDICATORS_CLIENT_APP}
1313 ${INDICATORS_CLIENT_HEADERS}
1414)
1515
16−qt5_use_modules(${INDICATORS_CLIENT_APP} Core Widgets Quick)
16+target_link_libraries(${INDICATORS_CLIENT_APP} Qt5::Core Qt5::Widgets Qt5::Quick)
1717
1818install(TARGETS ${INDICATORS_CLIENT_APP}
1919 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
tools/menutool/CMakeLists.txt+1−1
@@ -2,4 +2,4 @@ add_executable(menutool
22 menutool.cpp
33 )
44
5−qt5_use_modules(menutool Qml Quick)
5+target_link_libraries(menutool Qt5::Qml Qt5::Quick)
tools/scopetool/CMakeLists.txt+1−1
@@ -4,7 +4,7 @@ add_executable(${SCOPE_TOOL}
44 ../../src/UnixSignalHandler.cpp
55 )
66
7−qt5_use_modules(${SCOPE_TOOL} Qml Quick)
7+target_link_libraries(${SCOPE_TOOL} Qt5::Qml Qt5::Quick)
88
99# install binaries
1010install(TARGETS ${SCOPE_TOOL}