summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-11-27 13:45:11 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-01 03:38:42 +0000
commit47f23efaf42fdc3dc22b0781189d0937accf4325 (patch)
tree36d06128e6ac004661f8271c73d26c41dde20550 /src/plugins/platforms
parent211ad0f76883459304c7c3161a86ed5e20ffb2b5 (diff)
CMake: Re-generate project files in src
Change-Id: I1f5f822d68129490f1a7c495f718aead0b520ca9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d4e9f0e6332d1ea740e28718d21281099c6d62e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/eglfs/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt3
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt1
-rw-r--r--src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt1
5 files changed, 2 insertions, 7 deletions
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