diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-06-15 16:50:17 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-06-16 07:59:37 +0200 |
| commit | dd8e9f3fae84da3dd40b94122ad54d74d329163f (patch) | |
| tree | 2d73aba1f0f7a23a90051cb6a883698e5818b539 /tools | |
| parent | bc34eb85c1f66cc424d71543b363ef3658354f25 (diff) | |
qtquickcompiler: Fix compilation from different drive (Windows)
In this case the absolute path on Windows will start with e.g. "C:/", which
is not a valid file name. Therefore also convert colon to an underscore.
Pick-to: 5.15
Fixes: QTBUG-84901
Change-Id: If79245a5dda5a699f3dceb8e4f08e5a206d566a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 7353dfb17a..2e8e3f91b4 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -18,10 +18,9 @@ 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,\.\.,) - name = $$replace(name,-,_) + name = $$replace(name,[/\-:],_) name = $$absolute_path($$name, $$OUT_PWD) return($${name}) } |