From 3c66ade66fcb14975c811cd85b5a97c648ee5a1e Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 13 May 2011 16:49:51 +0200
Subject: 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>
---
 mkspecs/features/default_pre.prf | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index d451d29f7c..7088eb444e 100644
--- 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"
-- 
cgit v1.2.3