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

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>

diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index d451d29..7088eb4 100644 (file)
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -12,13 +12,6 @@ exists($$_PRO_FILE_PWD_/sync.profile) {
     isEmpty(QTDIR) {
         QTDIR = $$(QTDIR)
         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"