diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-06-15 16:50:17 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-16 09:25:11 +0000 |
| commit | 6adf57e8f3dac1912f532cb6956d989b8a148742 (patch) | |
| tree | 1376879a7b736a462b8a243818a2ae0807ef32f8 | |
| parent | a26f9042043b3b5a3ebbdd8f4b7cf277f9210de1 (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.
Fixes: QTBUG-84901
Change-Id: If79245a5dda5a699f3dceb8e4f08e5a206d566a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit dd8e9f3fae84da3dd40b94122ad54d74d329163f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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}) } |