From ac38fa11823f4cf020a9481c9de3d61caa8fccdc Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 3 Feb 2020 19:44:27 +0100
Subject: 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>
---
 src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 40 ++++++++++--------------
 1 file changed, 16 insertions(+), 24 deletions(-)

(limited to 'src/plugins/platforms/eglfs/.prev_CMakeLists.txt')

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)
-- 
cgit v1.2.3