diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-04-07 01:00:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-09 09:59:36 +0200 |
| commit | 61b7f5a0c1280d93d00c74e393c8244be626168c (patch) | |
| tree | 86d41573a283227dfbae92fe1249709914bb388e /tools | |
| parent | feeec8daa8412219dadddfb6e7cfa17f59451a32 (diff) | |
| parent | d868bb4f3e4b0424fd4a2989ff1c82692b0f014c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
Change-Id: Ifb27c6096297c729caff68945b3f710ce2009521
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 1e87a2d7e7..9fa982ca0f 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -2,7 +2,7 @@ qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER) qtPrepareTool(QMAKE_RCC, rcc, _DEP) -QMLCACHE_DIR = .qmlcache +isEmpty(QMLCACHE_DIR): QMLCACHE_DIR = . defineReplace(qmlCacheResourceFileOutputName) { name = $$relative_path($$1, $$_PRO_FILE_PWD_) |