summaryrefslogtreecommitdiff
path: root/qtcreator.pro
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-05-08 12:31:34 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-05-08 12:39:34 +0200
commitb5747ebdaeee64bb6b0fdcab915e6d82b882daa8 (patch)
tree03793fe9d1715268605328a79a35f343efed3e95 /qtcreator.pro
parent9f029d7acbdc23e5aa9a654b18ae185c789c7bc3 (diff)
downloadqt-creator-b5747ebdaeee64bb6b0fdcab915e6d82b882daa8.tar.gz
Inform Qt 5 about the .qmake.cache that we're generating
Change-Id: I2708b8382125302c07f4cce7ef8dcb8af989c78e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qtcreator.pro')
-rw-r--r--qtcreator.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/qtcreator.pro b/qtcreator.pro
index 9629d1e184..0836cf0685 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -38,6 +38,8 @@ exists(src/shared/qbs/qbs.pro) {
system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
}
+_QMAKE_CACHE_ = $$qmake_cache # Qt 4 support prevents us from using cache(), so tell Qt 5 about the cache
+
contains(QT_ARCH, i386): ARCHITECTURE = x86
else: ARCHITECTURE = $$QT_ARCH