feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Inform Qt 5 about the .qmake.cache that we're generating

Browse Source 
Change-Id: I2708b8382125302c07f4cce7ef8dcb8af989c78e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tor Arne Vestbø
2013-05-08 12:31:34 +02:00
committed by Oswald Buddenhagen
parent 9f029d7acb
commit b5747ebdae
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qtcreator.pro
View File

@@ -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