feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

don't look for specs next to the current project

Browse Source 
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 <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-08 21:21:03 +02:00
parent 868102ec24
commit 1c1c83f992
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -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()) {