From d4e9f0e6332d1ea740e28718d21281099c6d62e7 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 27 Nov 2020 13:45:11 +0100
Subject: CMake: Re-generate project files in src

Pick-to: 6.0
Change-Id: I1f5f822d68129490f1a7c495f718aead0b520ca9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/plugins/platforms/eglfs/.prev_CMakeLists.txt   |  2 --
 .../eglfs_kms_egldevice/.prev_CMakeLists.txt       |  3 ---
 .../eglfs_kms_support/.prev_CMakeLists.txt         |  2 --
 .../nsphotolibrarysupport/.prev_CMakeLists.txt     |  1 +
 .../optional/nsphotolibrarysupport/CMakeLists.txt  |  1 +
 src/plugins/styles/mac/.prev_CMakeLists.txt        | 23 ++++++++++++++++++++++
 6 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 src/plugins/styles/mac/.prev_CMakeLists.txt

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index cd1acc22e2..692ce6d2ff 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -86,8 +86,6 @@ qt_internal_add_plugin(QEglFSIntegrationPlugin
         qeglfsmain.cpp
     DEFINES
         QT_EGL_NO_X11
-    INCLUDE_DIRECTORIES
-        api
     PUBLIC_LIBRARIES
         Qt::EglFSDeviceIntegrationPrivate
 )
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt
index 6f1d5f6751..fd0ce77e0b 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt
@@ -14,9 +14,6 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
         qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h
     DEFINES
         QT_EGL_NO_X11
-    INCLUDE_DIRECTORIES
-        ../../api
-        ../eglfs_kms_support
     PUBLIC_LIBRARIES
         Libdrm::Libdrm
         Qt::Core
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt
index 4afa4fa843..e0e68f2610 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt
@@ -15,8 +15,6 @@ qt_internal_add_module(EglFsKmsSupport
         qeglfskmsscreen.cpp qeglfskmsscreen_p.h
     DEFINES
         QT_EGL_NO_X11
-    INCLUDE_DIRECTORIES
-        ../../api
     PUBLIC_LIBRARIES
         Libdrm::Libdrm
         Qt::Core
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt
index 526a053b02..f8d89cd1b7 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
     OUTPUT_NAME qiosnsphotolibrarysupport
     TYPE platforms/darwin
+    DEFAULT_IF FALSE
     SOURCES
         plugin.mm
         qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
index 1176e34935..82e5691d10 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
     OUTPUT_NAME qiosnsphotolibrarysupport
     TYPE platforms/darwin
+    DEFAULT_IF FALSE
     SOURCES
         plugin.mm
         qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
diff --git a/src/plugins/styles/mac/.prev_CMakeLists.txt b/src/plugins/styles/mac/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4c4e488d91
--- /dev/null
+++ b/src/plugins/styles/mac/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from mac.pro.
+
+#####################################################################
+## QMacStylePlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QMacStylePlugin
+    OUTPUT_NAME qmacstyle
+    TYPE styles
+    SOURCES
+        main.mm
+        qmacstyle_mac.mm qmacstyle_mac_p.h
+        qmacstyle_mac_p_p.h
+    LIBRARIES
+        ${FWAppKit}
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:mac.pro:<TRUE>:
+# DISTFILES = "macstyle.json"
-- 
cgit v1.2.3