diff options
| author | axis <qt-info@nokia.com> | 2011-05-13 16:49:51 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-03 19:36:04 +0200 |
| commit | 3c66ade66fcb14975c811cd85b5a97c648ee5a1e (patch) | |
| tree | 965b913e311e227d5fdaf78b7aeefd9ccf6ad8c8 | |
| parent | d3e048da7ef0f2f71a24e999feabbe1a56e3d936 (diff) | |
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>
| -rw-r--r-- | 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 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" |