summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-11 19:17:10 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-12 13:16:08 +0000
commite6a845ad88d0638a43c526f0de4115d9546b00a2 (patch)
treef058c7d0c4a1748a6c3062798364e12c0d30e805 /src/plugins/platforms
parenta0967c2a4f171e9edf6edef0c2ea966500343563 (diff)
Regenerate a bunch of projects after pro2cmake changes
Change-Id: I675a068411785364915a074ca0e631fec944d228 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/eglfs/.prev_CMakeLists.txt27
-rw-r--r--src/plugins/platforms/eglfs/CMakeLists.txt25
-rw-r--r--src/plugins/platforms/windows/.prev_CMakeLists.txt65
-rw-r--r--src/plugins/platforms/windows/CMakeLists.txt65
4 files changed, 93 insertions, 89 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 79496058e3..a47c1b0527 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -72,19 +72,20 @@ extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEM
EGLFS_PREFERRED_PLUGIN=
)
-# Resources:
-set(cursor_resource_files
- "cursor-atlas.png"
- "cursor.json"
-)
-
-add_qt_resource(EglFSDeviceIntegration "cursor"
- PREFIX
- "/"
- FILES
- ${cursor_resource_files}
-)
-
+if(NOT DEFINES___contains___QT_NO_CURSOR)
+ # Resources:
+ set(cursor_resource_files
+ "cursor-atlas.png"
+ "cursor.json"
+ )
+
+ add_qt_resource(EglFSDeviceIntegration "cursor"
+ PREFIX
+ "/"
+ FILES
+ ${cursor_resource_files}
+ )
+endif()
extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
SOURCES
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 26784ca291..8a3c77a5ac 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -58,19 +58,20 @@ extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupp
# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ...
# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ...
-# Resources:
-set(cursor_resource_files
- "cursor-atlas.png"
- "cursor.json"
-)
-
-add_qt_resource(EglFSDeviceIntegration "cursor"
- PREFIX
- "/"
- FILES
- ${cursor_resource_files}
-)
+if(QT_FEATURE_cursor) # special case
+ # Resources:
+ set(cursor_resource_files
+ "cursor-atlas.png"
+ "cursor.json"
+ )
+ add_qt_resource(EglFSDeviceIntegration "cursor"
+ PREFIX
+ "/"
+ FILES
+ ${cursor_resource_files}
+ )
+endif()
extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
SOURCES
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
index c5ea83e470..05c9d7c3ed 100644
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -185,38 +185,39 @@ extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
qwindowssessionmanager.cpp qwindowssessionmanager.h
)
-# Resources:
-set(cursors_resource_files
- "images/closedhandcursor_32.png"
- "images/closedhandcursor_48.png"
- "images/closedhandcursor_64.png"
- "images/dragcopycursor_32.png"
- "images/dragcopycursor_48.png"
- "images/dragcopycursor_64.png"
- "images/draglinkcursor_32.png"
- "images/draglinkcursor_48.png"
- "images/draglinkcursor_64.png"
- "images/dragmovecursor_32.png"
- "images/dragmovecursor_48.png"
- "images/dragmovecursor_64.png"
- "images/openhandcursor_32.png"
- "images/openhandcursor_48.png"
- "images/openhandcursor_64.png"
- "images/splithcursor_32.png"
- "images/splithcursor_48.png"
- "images/splithcursor_64.png"
- "images/splitvcursor_32.png"
- "images/splitvcursor_48.png"
- "images/splitvcursor_64.png"
-)
-
-add_qt_resource(qwindows "cursors"
- PREFIX
- "/qt-project.org/windows/cursors"
- FILES
- ${cursors_resource_files}
-)
-
+if(QT_FEATURE_imageformat_png)
+ # Resources:
+ set(cursors_resource_files
+ "images/closedhandcursor_32.png"
+ "images/closedhandcursor_48.png"
+ "images/closedhandcursor_64.png"
+ "images/dragcopycursor_32.png"
+ "images/dragcopycursor_48.png"
+ "images/dragcopycursor_64.png"
+ "images/draglinkcursor_32.png"
+ "images/draglinkcursor_48.png"
+ "images/draglinkcursor_64.png"
+ "images/dragmovecursor_32.png"
+ "images/dragmovecursor_48.png"
+ "images/dragmovecursor_64.png"
+ "images/openhandcursor_32.png"
+ "images/openhandcursor_48.png"
+ "images/openhandcursor_64.png"
+ "images/splithcursor_32.png"
+ "images/splithcursor_48.png"
+ "images/splithcursor_64.png"
+ "images/splitvcursor_32.png"
+ "images/splitvcursor_48.png"
+ "images/splitvcursor_64.png"
+ )
+
+ add_qt_resource(qwindows "cursors"
+ PREFIX
+ "/qt-project.org/windows/cursors"
+ FILES
+ ${cursors_resource_files}
+ )
+endif()
extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
LIBRARIES
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index 18764124e4..ba90c88ece 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -186,38 +186,39 @@ extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
qwindowssessionmanager.cpp qwindowssessionmanager.h
)
-# Resources:
-set(cursors_resource_files
- "images/closedhandcursor_32.png"
- "images/closedhandcursor_48.png"
- "images/closedhandcursor_64.png"
- "images/dragcopycursor_32.png"
- "images/dragcopycursor_48.png"
- "images/dragcopycursor_64.png"
- "images/draglinkcursor_32.png"
- "images/draglinkcursor_48.png"
- "images/draglinkcursor_64.png"
- "images/dragmovecursor_32.png"
- "images/dragmovecursor_48.png"
- "images/dragmovecursor_64.png"
- "images/openhandcursor_32.png"
- "images/openhandcursor_48.png"
- "images/openhandcursor_64.png"
- "images/splithcursor_32.png"
- "images/splithcursor_48.png"
- "images/splithcursor_64.png"
- "images/splitvcursor_32.png"
- "images/splitvcursor_48.png"
- "images/splitvcursor_64.png"
-)
-
-add_qt_resource(qwindows "cursors"
- PREFIX
- "/qt-project.org/windows/cursors"
- FILES
- ${cursors_resource_files}
-)
-
+if(QT_FEATURE_imageformat_png)
+ # Resources:
+ set(cursors_resource_files
+ "images/closedhandcursor_32.png"
+ "images/closedhandcursor_48.png"
+ "images/closedhandcursor_64.png"
+ "images/dragcopycursor_32.png"
+ "images/dragcopycursor_48.png"
+ "images/dragcopycursor_64.png"
+ "images/draglinkcursor_32.png"
+ "images/draglinkcursor_48.png"
+ "images/draglinkcursor_64.png"
+ "images/dragmovecursor_32.png"
+ "images/dragmovecursor_48.png"
+ "images/dragmovecursor_64.png"
+ "images/openhandcursor_32.png"
+ "images/openhandcursor_48.png"
+ "images/openhandcursor_64.png"
+ "images/splithcursor_32.png"
+ "images/splithcursor_48.png"
+ "images/splithcursor_64.png"
+ "images/splitvcursor_32.png"
+ "images/splitvcursor_48.png"
+ "images/splitvcursor_64.png"
+ )
+
+ add_qt_resource(qwindows "cursors"
+ PREFIX
+ "/qt-project.org/windows/cursors"
+ FILES
+ ${cursors_resource_files}
+ )
+endif()
extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
LIBRARIES