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/ios/CMakeLists.txt           | 30 +++++++---------------
 src/plugins/platforms/ios/optional/CMakeLists.txt  |  1 -
 .../optional/nsphotolibrarysupport/CMakeLists.txt  |  3 +--
 3 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'src/plugins/platforms/ios')

diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index 4c9cac2bee..d8912866b0 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from ios.pro.
 
 #####################################################################
-## qios Plugin:
+## QIOSIntegrationPlugin Plugin:
 #####################################################################
 
-add_qt_plugin(qios
+add_qt_plugin(QIOSIntegrationPlugin
+    OUTPUT_NAME qios
     TYPE platforms
-    CLASS_NAME QIOSIntegrationPlugin
     SOURCES
         plugin.mm
         qiosapplicationdelegate.h qiosapplicationdelegate.mm
@@ -26,37 +26,25 @@ add_qt_plugin(qios
         qioswindow.h qioswindow.mm
         quiaccessibilityelement.h quiaccessibilityelement.mm
         quiview.h quiview.mm
-    LIBRARIES
-        Qt::ClipboardSupportPrivate
-        Qt::CorePrivate
-        Qt::FontDatabaseSupportPrivate
-        Qt::GraphicsSupportPrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         ${FWAudioToolbox}
         ${FWFoundation}
         ${FWQuartzCore}
         ${FWUIKit}
-        Qt::ClipboardSupport
-        Qt::Core
-        Qt::FontDatabaseSupport
-        Qt::GraphicsSupport
-        Qt::Gui
+        Qt::ClipboardSupportPrivate
+        Qt::CorePrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GraphicsSupportPrivate
+        Qt::GuiPrivate
 )
 
 #### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>:
 # OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm"
-# PLUGIN_CLASS_NAME = "QIOSIntegrationPlugin"
-# PLUGIN_TYPE = "platforms"
-# _LOADED = "qt_plugin"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 3:.:.:kernel.pro:QT_FEATURE_shared:
-# CONFIG = "static"
-
-extend_target(qios CONDITION NOT APPLE_TVOS
+extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
     SOURCES
         qiosclipboard.h qiosclipboard.mm
         qiosfiledialog.h qiosfiledialog.mm
diff --git a/src/plugins/platforms/ios/optional/CMakeLists.txt b/src/plugins/platforms/ios/optional/CMakeLists.txt
index a3807bee6c..3c84e61f26 100644
--- a/src/plugins/platforms/ios/optional/CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/CMakeLists.txt
@@ -1,6 +1,5 @@
 # Generated from optional.pro.
 
-
 if(APPLE_IOS)
     add_subdirectory(nsphotolibrarysupport)
 endif()
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
index 0f9128c6f7..0fbb0fdbd8 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
@@ -12,14 +12,13 @@ add_qt_plugin(QIosOptionalPlugin_NSPhotoLibrary
         qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
         qiosfileenginefactory.h
         qiosimagepickercontroller.h qiosimagepickercontroller.mm
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         ${FWAssetsLibrary}
         ${FWFoundation}
         ${FWUIKit}
         Qt::Core
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 #### Keys ignored in scope 1:.:.:nsphotolibrarysupport.pro:<TRUE>:
-- 
cgit v1.2.3