diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-11-04 11:20:10 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-12-17 17:35:04 +0100 |
| commit | 155a2e0d8d1d9c07fa22f523d84e3d583697aff4 (patch) | |
| tree | b16ccf681ea815699df4ac4b6e35aef0d7571806 /tools | |
| parent | 896f772581849f970df5ecb2b73a829c9a0348b4 (diff) | |
Fix usage of qtquickcompiler.prf after lrelease.prf
Consider a project that sets
CONFIG += lrelease embed_translations qtquickcompiler
qtquickcompiler.prf is loaded first and loads resources.prf.
Then lrelease.prf is loaded and extends RESOURCES.
The latter changes are never picked up, because resources.prf was
already loaded which is recorded in QMAKE_INTERNAL_INCLUDED_FEATURES.
Use the newly introduced qtFlattenResources function instead of
fully loading resources.prf.
Task-number: QTBUG-79672
Change-Id: I1894ede97b4d5de567971a1a8cef407460bba97d
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 2f98aadefe..77906b19a6 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -31,7 +31,8 @@ defineTest(qtQuickSkippedResourceFile) { } # Flatten RESOURCES that may contain individual files or objects -load(resources) +load(resources_functions) +qtFlattenResources() NEWRESOURCES = QMLCACHE_RESOURCE_FILES = |