From 95c27e325f47cff168a85c21b4b9e592168384f9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 9 Aug 2019 12:47:55 +0200 Subject: 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 Reviewed-by: Leander Beernaert --- src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 34 +++++------------------- src/plugins/platforms/eglfs/CMakeLists.txt | 11 +++++--- 2 files changed, 14 insertions(+), 31 deletions(-) (limited to 'src/plugins/platforms') 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) - -- cgit v1.2.3