diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-09 01:00:12 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-09 01:00:12 +0200 |
| commit | 5e0222a9e474d21a686fa253d7c1ad840e9ee274 (patch) | |
| tree | 72b89948cd58f3830563ad50e4ea7b2195d13aca /tools | |
| parent | 01ed625542f9b4233b8c1a940f78eff7292fc350 (diff) | |
| parent | 783c40a59013123f230663743577f6c542f142c7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ib37d3a31e34581fa542fa02d54fac77661d72614
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 7d8a857847..608b5c9143 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -6,6 +6,7 @@ isEmpty(QMLCACHE_DIR): QMLCACHE_DIR = . defineReplace(qmlCacheResourceFileOutputName) { name = $$relative_path($$1, $$_PRO_FILE_PWD_) + contains(name, ^\\.\\..*): name = $$relative_path($$1, $$OUT_PWD) name = $$replace(name,/,_) name = $$replace(name, \\.qrc$, _qmlcache.qrc) name = $$replace(name,\.\.,) |