From 1c1c83f992da432fc8a3307566e376c11cb48594 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 8 Jun 2012 21:21:03 +0200 Subject: [PATCH] don't look for specs next to the current project this seems to be another contender for the most useless feature ever. follow suit with qmake. it got a less useless replacement, which will follow here as well. Change-Id: I5b6f7411178294acb4ef001535b46a2c37206b51 Reviewed-by: Daniel Teske --- src/shared/proparser/qmakeevaluator.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index a7cc71e01d4..577e42f7988 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -898,14 +898,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile( if (qmakespec.isEmpty()) qmakespec = QLatin1String("default"); if (IoUtils::isRelativePath(qmakespec)) { - if (IoUtils::exists(currentDirectory() + QLatin1Char('/') + qmakespec - + QLatin1String("/qmake.conf"))) { - qmakespec = currentDirectory() + QLatin1Char('/') + qmakespec; - } else if (!m_outputDir.isEmpty() - && IoUtils::exists(m_outputDir + QLatin1Char('/') + qmakespec - + QLatin1String("/qmake.conf"))) { - qmakespec = m_outputDir + QLatin1Char('/') + qmakespec; - } else { foreach (const QString &root, qmakeMkspecPaths()) { QString mkspec = root + QLatin1Char('/') + qmakespec; if (IoUtils::exists(mkspec)) { @@ -917,7 +909,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile( // Unlike in qmake, a missing config is not critical ... qmakespec.clear(); cool: ; - } } if (!qmakespec.isEmpty()) {