summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/eglfs
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-02-03 19:44:27 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-02-05 14:36:31 +0000
commitac38fa11823f4cf020a9481c9de3d61caa8fccdc (patch)
treec7a07940738e7015cb43e28f97b9f2bde794b039 /src/plugins/platforms/eglfs
parentc5b61d2e90fde5d9f2e968f4443ca393e52393f5 (diff)
Regenerate projects to correctly handle private dependencies
Change-Id: I7d84bc9962bff5c89a90367ae704974c6ce2ec89 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms/eglfs')
-rw-r--r--src/plugins/platforms/eglfs/.prev_CMakeLists.txt40
-rw-r--r--src/plugins/platforms/eglfs/CMakeLists.txt28
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt8
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt13
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt13
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt12
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt8
7 files changed, 50 insertions, 72 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 6f3309ea3c..4fed525392 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -19,7 +19,7 @@ qt_add_module(EglFSDeviceIntegration
QT_EGL_NO_X11
INCLUDE_DIRECTORIES
api
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::DeviceDiscoverySupportPrivate
Qt::EglSupportPrivate
@@ -29,16 +29,6 @@ qt_add_module(EglFSDeviceIntegration
Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate
- PUBLIC_LIBRARIES
- Qt::Core
- Qt::DeviceDiscoverySupport
- Qt::EglSupport
- Qt::EventDispatcherSupport
- Qt::FbSupport
- Qt::FontDatabaseSupport
- Qt::Gui
- Qt::ServiceSupport
- Qt::ThemeSupport
)
#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
@@ -48,17 +38,21 @@ qt_add_module(EglFSDeviceIntegration
#####################################################################
qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
- LIBRARIES
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
- Qt::InputSupport
+ Qt::InputSupportPrivate
)
qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
+ SOURCES
+ api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
+ api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
PUBLIC_LIBRARIES
- Qt::PlatformCompositorSupport
+ Qt::VulkanSupportPrivate
)
qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
@@ -92,30 +86,28 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
api/qeglfscursor.cpp api/qeglfscursor_p.h
)
#####################################################################
-## qeglfs Plugin:
+## QEglFSIntegrationPlugin Plugin:
#####################################################################
-qt_add_plugin(qeglfs
+qt_add_plugin(QEglFSIntegrationPlugin
+ OUTPUT_NAME qeglfs
TYPE platforms
- CLASS_NAME QEglFSIntegrationPlugin
SOURCES
qeglfsmain.cpp
DEFINES
QT_EGL_NO_X11
INCLUDE_DIRECTORIES
api
- LIBRARIES
- Qt::EglFSDeviceIntegrationPrivate
PUBLIC_LIBRARIES
- Qt::EglFSDeviceIntegration
+ Qt::EglFSDeviceIntegrationPrivate
)
-#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>:
+#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:<TRUE>:
# OTHER_FILES = "$$PWD/eglfs.json"
## Scopes:
#####################################################################
-#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(deviceintegration)
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 01949586bc..03de79d6f0 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -20,7 +20,7 @@ qt_add_module(EglFSDeviceIntegration
QT_EGL_NO_X11
INCLUDE_DIRECTORIES
api
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::DeviceDiscoverySupportPrivate
Qt::EglSupportPrivate
@@ -40,17 +40,21 @@ qt_add_module(EglFSDeviceIntegration
#####################################################################
qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
- LIBRARIES
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
- Qt::InputSupport
+ Qt::InputSupportPrivate
)
qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
+ SOURCES
+ api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
+ api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
PUBLIC_LIBRARIES
- Qt::PlatformCompositorSupport
+ Qt::VulkanSupportPrivate
)
# special case:
@@ -78,12 +82,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
api/qeglfscursor.cpp api/qeglfscursor_p.h
)
#####################################################################
-## qeglfs Plugin:
+## QEglFSIntegrationPlugin Plugin:
#####################################################################
-qt_add_plugin(qeglfs
+qt_add_plugin(QEglFSIntegrationPlugin
+ OUTPUT_NAME qeglfs
TYPE platforms
- CLASS_NAME QEglFSIntegrationPlugin
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case
SOURCES
qeglfsmain.cpp
@@ -91,18 +95,18 @@ qt_add_plugin(qeglfs
QT_EGL_NO_X11
INCLUDE_DIRECTORIES
api
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate # special case
Qt::EglFSDeviceIntegrationPrivate
EGL::EGL # special case
)
-#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>:
+#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:<TRUE>:
# OTHER_FILES = "$$PWD/eglfs.json"
## Scopes:
#####################################################################
-#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(deviceintegration)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
index fa6623ee50..a62b8bbb2b 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
@@ -15,14 +15,12 @@ qt_add_plugin(QEglFSEmulatorIntegrationPlugin
QT_EGL_NO_X11
INCLUDE_DIRECTORIES
../../api
- LIBRARIES
- Qt::CorePrivate
- Qt::EglFSDeviceIntegrationPrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Core
- Qt::EglFSDeviceIntegration
+ Qt::CorePrivate
+ Qt::EglFSDeviceIntegrationPrivate
Qt::Gui
+ Qt::GuiPrivate
)
#### Keys ignored in scope 1:.:.:eglfs_emu.pro:<TRUE>:
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
index d2a2b9699d..55a1d71c07 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -19,21 +19,16 @@ qt_add_plugin(QEglFSKmsGbmIntegrationPlugin
INCLUDE_DIRECTORIES
../../api
../eglfs_kms_support
- LIBRARIES
+ PUBLIC_LIBRARIES
+ Libdrm::Libdrm
+ Qt::Core
Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::EglFSDeviceIntegrationPrivate
Qt::EglFsKmsSupportPrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::KmsSupportPrivate
- PUBLIC_LIBRARIES
- Libdrm::Libdrm
- Qt::Core
- Qt::EdidSupport
- Qt::EglFSDeviceIntegration
- Qt::EglFsKmsSupport
- Qt::Gui
- Qt::KmsSupport
gbm::gbm
)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
index 63335ced92..a0b405c90c 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -17,21 +17,16 @@ qt_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
INCLUDE_DIRECTORIES
../../api
../eglfs_kms_support
- LIBRARIES
+ PUBLIC_LIBRARIES
+ Libdrm::Libdrm
+ Qt::Core
Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::EglFSDeviceIntegrationPrivate
Qt::EglFsKmsSupportPrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::KmsSupportPrivate
- PUBLIC_LIBRARIES
- Libdrm::Libdrm
- Qt::Core
- Qt::EdidSupport
- Qt::EglFSDeviceIntegration
- Qt::EglFsKmsSupport
- Qt::Gui
- Qt::KmsSupport
)
#### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:<TRUE>:
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
index 51b3327345..abaad3930d 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@@ -17,17 +17,13 @@ qt_add_module(EglFsKmsSupport
QT_EGL_NO_X11
INCLUDE_DIRECTORIES
../../api
- LIBRARIES
+ PUBLIC_LIBRARIES
+ Libdrm::Libdrm
+ Qt::Core
Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::EglFSDeviceIntegrationPrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::KmsSupportPrivate
- PUBLIC_LIBRARIES
- Libdrm::Libdrm
- Qt::Core
- Qt::EdidSupport
- Qt::EglFSDeviceIntegration
- Qt::Gui
- Qt::KmsSupport
)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
index cad49366c8..29dcd0dab7 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@@ -14,14 +14,12 @@ qt_add_plugin(QEglFSX11IntegrationPlugin
QT_EGL_NO_X11
INCLUDE_DIRECTORIES
../../api
- LIBRARIES
- Qt::CorePrivate
- Qt::EglFSDeviceIntegrationPrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Core
- Qt::EglFSDeviceIntegration
+ Qt::CorePrivate
+ Qt::EglFSDeviceIntegrationPrivate
Qt::Gui
+ Qt::GuiPrivate
X11::XCB
XCB::XCB
)