From 5b7280819277e45a6011d35bf28bf3fdc1ff8669 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 19 Aug 2010 16:11:10 +0200
Subject: [PATCH] Reuse existing string for new "builddir.level !=
sourdir.level" warning
* Revert this once string freeze is over!
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 33b31024969..7eae510d64f 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)));
}
--
GitLab