1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't base QTDIR detection on .qmake.cache.

Browse Source 
Change-Id: I4adc26c1c070d26277551d302f4638b819ddc311
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
axis 2011-05-13 16:49:51 +02:00 committed by Qt Continuous Integration System
parent d3e048da7e
commit 3c66ade66f
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/features/default_pre.prf
View File

@ -12,13 +12,6 @@ exists($$_PRO_FILE_PWD_/sync.profile) {
isEmpty(QTDIR) { isEmpty(QTDIR) {
QTDIR = $$(QTDIR) QTDIR = $$(QTDIR)
isEmpty(QTDIR):QTDIR = $$QT_BUILD_TREE isEmpty(QTDIR):QTDIR = $$QT_BUILD_TREE
isEmpty(QTDIR):QTDIR = $$dirname(_QMAKE_CACHE_)
isEmpty(QTDIR) {
QMAKE_BASED_QTDIR = $$dirname(QMAKE_QMAKE)
QMAKE_BASED_QTDIR = $$dirname(QMAKE_BASED_QTDIR)
exists($$QMAKE_BASED_QTDIR/mkspecs/qconfig.pri): QTDIR = $$QMAKE_BASED_QTDIR
unset(QMAKE_BASED_QTDIR)
}
} }
isEmpty(QTDIR):QTFWD="-no-module-fwd" isEmpty(QTDIR):QTFWD="-no-module-fwd"