From 6b7d731bbd1ea4a3dfcf170fb2790c38bec7e536 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 13 May 2011 16:49:51 +0200 Subject: [PATCH 4/4] Don't base QTDIR detection on .qmake.cache. --- mkspecs/features/default_pre.prf | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index adcdbb7..047277e 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" -- 1.7.3.4