diff options
| author | Joni Poikelin <joni.poikelin@qt.io> | 2017-04-24 09:45:25 +0300 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@qt.io> | 2017-04-24 07:22:04 +0000 |
| commit | 3ba11cf93820610273e2a16b13ab1d8c57a41d36 (patch) | |
| tree | 9ffdab1a6b54e3489911d5cc01db2cff560a340a | |
| parent | e56eb1fc60d614b652400030074ca334deea98b6 (diff) | |
| download | qtquickcontrols-3ba11cf93820610273e2a16b13ab1d8c57a41d36.tar.gz | |
Fix packaging of shaders when qmlcache is used
Task-number: QTBUG-60320
Change-Id: Iac74b469e971d28218fd35eadefb3c3b4bca4e51
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/controls/controls.pro | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 5f40c0a3..6f78443e 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -60,33 +60,11 @@ include(Shaders/shaders.pri) osx: LIBS_PRIVATE += -framework Carbon !qmlcache { - # Create the resource file - GENERATED_RESOURCE_FILE = $$OUT_PWD/controls.qrc - INCLUDED_RESOURCE_FILES = \ $$CONTROLS_QML_FILES \ $$PRIVATE_QML_FILES \ - $$STYLES_QML_FILES \ - $$SHADER_FILES - - RESOURCE_CONTENT = \ - "<RCC>" \ - "<qresource prefix=\"/QtQuick/Controls\">" - - for(resourcefile, INCLUDED_RESOURCE_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" - } - - RESOURCE_CONTENT += \ - "</qresource>" \ - "</RCC>" + $$STYLES_QML_FILES - write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") - - RESOURCES += $$GENERATED_RESOURCE_FILE } else { QML_FILES *= $$CONTROLS_QML_FILES \ $$PRIVATE_QML_FILES \ @@ -95,5 +73,11 @@ osx: LIBS_PRIVATE += -framework Carbon OTHER_FILES += $$QML_FILES } +INCLUDED_RESOURCE_FILES += $$SHADER_FILES + +controls.files = $$INCLUDED_RESOURCE_FILES +controls.prefix = /QtQuick/Controls +RESOURCES += controls + CONFIG += no_cxx_module load(qml_plugin) |