diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2019-12-12 09:50:16 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2019-12-12 09:55:55 +0100 |
| commit | 1dca7087e9a8ae6bdeb46be4f57948549c1f7362 (patch) | |
| tree | 11ad67778691bbc5df95b9040223456305e0880c | |
| parent | c496fee2a5b65fd1b0672923293db058486e350e (diff) | |
| download | qtbase-1dca7087e9a8ae6bdeb46be4f57948549c1f7362.tar.gz | |
Account for when qtquickcompiler is used when getting the resources
When passing the resources used to the android deployment setting json
file it needs to check the variable generated by the qtquickcompiler
feature so that it can still find the qrc files originally populated in
the resources. This ensures that qmlimportscanner can still scan the
original qrc files when determining which QML import plugins are
needed.
Fixes: QTBUG-80713
Change-Id: I695b289eaaa78cc6c355fa8abd22a8a1031a9f6c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index e781eb024c..f375a687a9 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -63,11 +63,12 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { QML_ROOT_PATH = $$_PRO_FILE_PWD_ FILE_CONTENT += " \"qml-root-path\": $$emitString($$QML_ROOT_PATH)," FILE_CONTENT += " \"stdcpp-path\": $$emitString($$ANDROID_STDCPP_PATH)," - !isEmpty(RESOURCES) { + !isEmpty(RESOURCES)|!isEmpty(QMLCACHE_RESOURCE_FILES) { # Make sure that qmake generated qrc files are accounted for load(resources_functions) qtFlattenResources() - for(resource, RESOURCES) { + NEWRESOURCES = $$RESOURCES $$QMLCACHE_RESOURCE_FILES + for(resource, NEWRESOURCES) { contains(resource, ".*\\qmake_qmake_immediate.qrc$") { # They will be created for each architecture, since they could be different # we need to account for all of them |