diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-11 10:19:42 +0100 |
| commit | f1ae5ae726cf909e4ee943eae8e09f8aff74bb3e (patch) | |
| tree | 0035f377344b27ec20aa3e2d9b64eab4d971a42a /src/plugins/platforms/xcb/.prev_CMakeLists.txt | |
| parent | 79da236e76752c1f940036dffffebb8d2a707d66 (diff) | |
| parent | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'src/plugins/platforms/xcb/.prev_CMakeLists.txt')
| -rw-r--r-- | src/plugins/platforms/xcb/.prev_CMakeLists.txt | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index c504bbc64d..e15d45aa63 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -38,7 +38,7 @@ qt_add_module(XcbQpa QT_NO_FOREACH INCLUDE_DIRECTORIES gl_integrations - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::EdidSupportPrivate Qt::FontDatabaseSupportPrivate @@ -46,14 +46,6 @@ qt_add_module(XcbQpa Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate Qt::XkbCommonSupportPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::EdidSupport - Qt::FontDatabaseSupport - Qt::Gui - Qt::ServiceSupport - Qt::ThemeSupport - Qt::XkbCommonSupport XCB::ICCCM XCB::IMAGE XCB::KEYSYMS @@ -75,20 +67,16 @@ qt_add_module(XcbQpa ##################################################################### qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate - LIBRARIES - Qt::LinuxAccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::LinuxAccessibilitySupport + Qt::LinuxAccessibilitySupportPrivate ) qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib @@ -146,24 +134,20 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_nativ WrapFreetype::WrapFreetype ) ##################################################################### -## qxcb Plugin: +## QXcbIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qxcb +qt_add_plugin(QXcbIntegrationPlugin + OUTPUT_NAME qxcb TYPE platforms - CLASS_NAME QXcbIntegrationPlugin SOURCES qxcbmain.cpp DEFINES QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::XcbQpaPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::XcbQpa ) #### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>: |