summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2010-08-19 16:11:10 +0200
committerTobias Hunger <tobias.hunger@nokia.com>2010-08-19 16:11:10 +0200
commit5b7280819277e45a6011d35bf28bf3fdc1ff8669 (patch)
tree035665411eaa6e0f21bc4f05c4756fdf073f4ae6
parent423686c0a9a400869d2f7b27f0bbad0f4163da23 (diff)
downloadqt-creator-5b7280819277e45a6011d35bf28bf3fdc1ff8669.tar.gz
Reuse existing string for new "builddir.level != sourdir.level" warning
* Revert this once string freeze is over!
-rw-r--r--src/plugins/qt4projectmanager/qtversionmanager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 33b3102496..7eae510d64 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -673,8 +673,12 @@ QtVersion::reportIssues(const QString &proFile, const QString &buildDir)
results.append(ProjectExplorer::Task(ProjectExplorer::Task::Warning, msg, QString(), -1,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
} else if (tmpBuildDir.count(QChar('/')) != sourcePath.count(QChar('/'))) {
+ // FIXME: We currently are in string freeze, so I have to reuse some existing text!
+ // const QString msg = QCoreApplication::translate("Qt4ProjectManager::QtVersion",
+ // "The build directory needs to be at the same level as the source directory.");
const QString msg = QCoreApplication::translate("Qt4ProjectManager::QtVersion",
- "The build directory needs to be at the same level as the source directory.");
+ "Qmake does not support build directories below the source directory.");
+
results.append(ProjectExplorer::Task(ProjectExplorer::Task::Warning, msg, QString(), -1,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
}