From 9159a7c3db4a0625a2cbe690df5d22f8db1616d1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 27 Mar 2018 13:29:52 +0200 Subject: Fix debug-and-release builds with CONFIG += qtquickcompiler Allow for QMLCACHE_DIR to be pre-defined when modified with debug or release suffix via exclusive_builds_post.prf. Task-number: QTBUG-66675 Change-Id: I007fd8359a860e4c7c2b3efdd90a678ddaad72c3 Reviewed-by: Oswald Buddenhagen --- tools/qmlcachegen/qtquickcompiler.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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_) -- cgit v1.2.3