diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-19 11:32:10 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-19 13:30:16 +0000 |
| commit | ac00839eb91e22d58e9f3de519333d879a268c4d (patch) | |
| tree | 3fc33d0a7bebbbace56de8089a9f9fbde86ad53c | |
| parent | 24ff4c4977eba6ac072fabacff86fedd96ef0c71 (diff) | |
Fix support for QTQUICK_COMPILER_SKIPPED_RESOURCES
This used to work with QQC before 5.11 and somehow was lost in
translation.
Change-Id: Id3d38c609e228d0f7676d3fb177b271eb46f6f73
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 9fa982ca0f..d05908560d 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -14,6 +14,13 @@ defineReplace(qmlCacheResourceFileOutputName) { return($${name}) } +defineTest(qtQuickSkippedResourceFile) { + for(skippedRes, QTQUICK_COMPILER_SKIPPED_RESOURCES) { + equals(1, $$skippedRes): return(true) + } + return(false) +} + # Flatten RESOURCES that may contain individual files or objects load(resources) @@ -21,6 +28,11 @@ NEWRESOURCES = QMLCACHE_RESOURCE_FILES = for(res, RESOURCES) { + qtQuickSkippedResourceFile($$res) { + NEWRESOURCES += $$res + next() + } + absRes = $$absolute_path($$res, $$_PRO_FILE_PWD_) rccContents = $$system($$QMAKE_RCC_DEP -list $$system_quote($$absRes),lines) contains(rccContents,.*\\.js$)|contains(rccContents,.*\\.qml$) { |