diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 21:26:54 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 21:26:54 (GMT) |
| commit | 9748269cb58266fdfdac2c8820dad8c473dcf512 (patch) | |
| tree | 81cdd7830afb6507429594e133e18ca9f420dd8c /tools/linguist/shared/profileevaluator.cpp | |
| parent | 9a33a0027883ab77c10d8a9d9d9df5b4c2c5d50b (diff) | |
| parent | ba25c4a832516124bcd97758de9eede32797c5a0 (diff) | |
| download | Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.zip Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.tar.gz Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
Diffstat (limited to 'tools/linguist/shared/profileevaluator.cpp')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index b9984cc..173b46e 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -913,7 +913,7 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths() // if (!specdir.cdUp() || specdir.isRoot()) // break; // if (QFile::exists(specdir.path() + QDir::separator() + "features")) { - // foreach (const QString &concat_it, concat) + // foreach (const QString &concat_it, concat) // feature_roots << (specdir.path() + concat_it); // break; // } @@ -1808,7 +1808,7 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct parents.append(proFile->fileName()); if (!parents.isEmpty()) parents.takeLast(); - if (parents.isEmpty()) + if (parents.isEmpty()) q->fileMessage(format("Project ERROR: %1").arg(msg)); else q->fileMessage(format("Project ERROR: %1. File was included from: '%2'") |