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

search for default spec just like for other ones

Browse Source 
follow suit with qmake ...

Change-Id: I02d4f477356734c83ad6681307166f6495ad7d2a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-08 16:52:49 +02:00
parent 39fcc3080f
commit 868102ec24
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -894,23 +894,9 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
}
m_option->cachefile = qmake_cache;
QStringList mkspec_roots = qmakeMkspecPaths();
QString qmakespec = m_option->expandEnvVars(m_option->qmakespec);
if (qmakespec.isEmpty()) {
foreach (const QString &root, mkspec_roots) {
QString mkspec = root + QLatin1String("/default");
if (IoUtils::fileType(mkspec) == IoUtils::FileIsDir) {
qmakespec = mkspec;
break;
}
}
if (qmakespec.isEmpty()) {
m_handler->configError(fL1S("Could not find qmake configuration directory"));
// Unlike in qmake, not finding the spec is not critical ...
}
}
if (qmakespec.isEmpty())
qmakespec = QLatin1String("default");
if (IoUtils::isRelativePath(qmakespec)) {
if (IoUtils::exists(currentDirectory() + QLatin1Char('/') + qmakespec
+ QLatin1String("/qmake.conf"))) {
@@ -920,7 +906,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
+ QLatin1String("/qmake.conf"))) {
qmakespec = m_outputDir + QLatin1Char('/') + qmakespec;
} else {
foreach (const QString &root, mkspec_roots) {
foreach (const QString &root, qmakeMkspecPaths()) {
QString mkspec = root + QLatin1Char('/') + qmakespec;
if (IoUtils::exists(mkspec)) {
qmakespec = mkspec;