summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-08-09 12:47:55 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-08-09 11:50:11 +0000
commit95c27e325f47cff168a85c21b4b9e592168384f9 (patch)
treec70a0f84751a43c433b3e88c49f7e6ee4e63d1de /src/plugins/platforms
parentaaec0726234f1e7eb23087b04426591b81307e5a (diff)
Fix add_qt_resource behavior with regards to unspecified prefixes
This change makes the PREFIX parameter a required parameter if the target does not specify a default. This way the behavior is clear when reading the code: add_qt_resource() without PREFIX means it must come frmo the target. Change-Id: I79024e70e7b4d32a5164b93aa08ec9ff409b2d39 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/eglfs/.prev_CMakeLists.txt34
-rw-r--r--src/plugins/platforms/eglfs/CMakeLists.txt11
2 files changed, 14 insertions, 31 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index e747e1d3c1..0f7c305a40 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -77,9 +77,13 @@ extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEM
# CONFIG = "no_linker_version_script"
# Resources:
-add_qt_resource(EglFSDeviceIntegration "cursor" FILES
- cursor-atlas.png
- cursor.json)
+add_qt_resource(EglFSDeviceIntegration "cursor"
+ PREFIX
+ "/"
+ FILES
+ cursor-atlas.png
+ cursor.json
+)
extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
@@ -119,27 +123,3 @@ add_qt_plugin(qeglfs
#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(deviceintegration)
-
- if(TARGET Qt::InputSupportPrivate)
- endif()
-
- if(TARGET Qt::PlatformCompositorSupportPrivate)
- endif()
-
- if(NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY)
- endif()
-
- if(NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY)
- endif()
-
- if(use_gold_linker)
- endif()
-
- if(NOT DEFINES___contains___QT_NO_CURSOR)
- endif()
-
- if(QT_FEATURE_opengl)
- endif()
-
- if(NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN)
- endif()
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 6705e40e0d..510a606152 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -63,9 +63,13 @@ extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupp
# CONFIG = "no_linker_version_script"
# Resources:
-add_qt_resource(EglFSDeviceIntegration "cursor" FILES
- cursor-atlas.png
- cursor.json)
+add_qt_resource(EglFSDeviceIntegration "cursor"
+ PREFIX
+ "/"
+ FILES
+ cursor-atlas.png
+ cursor.json
+)
extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
@@ -106,4 +110,3 @@ add_qt_plugin(qeglfs
#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
add_subdirectory(deviceintegration)
-