diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-12 15:13:53 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-12 16:01:23 +0000 |
commit | 304e1c0bbaf8fb0997f249da2db4f21a62cc0e0e (patch) | |
tree | 207c1671417d8ed836d69ad5ccde24d6abbf541a /src/plugins/qtsupport/baseqtversion.cpp | |
parent | c2a195810f42fbfcafc00702fa5433c037ff20e3 (diff) |
QtSupport: Move warning to QmakeProjectManager
Only qmake requires the build directory to be at the same level as the
source directory, but the warning appeared also for cmake and qbs
projects.
Change-Id: I2c2c39b0a6004bb4efe80bf6ff56c3f9e22ec51d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 71471f1158..3b022db233 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1397,12 +1397,10 @@ void BaseQtVersion::recheckDumper() QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QString &buildDir) const { + Q_UNUSED(proFile); + Q_UNUSED(buildDir); QList<Task> results; - QString tmpBuildDir = QDir(buildDir).absolutePath(); - if (!tmpBuildDir.endsWith(QLatin1Char('/'))) - tmpBuildDir.append(QLatin1Char('/')); - if (!isValid()) { //: %1: Reason for being invalid const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", "The Qt version is invalid: %1").arg(invalidReason()); @@ -1420,18 +1418,6 @@ QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QStrin ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); } - QString sourcePath = QFileInfo(proFile).absolutePath(); - const QChar slash = QLatin1Char('/'); - if (!sourcePath.endsWith(slash)) - sourcePath.append(slash); - if (tmpBuildDir.count(slash) != sourcePath.count(slash)) { - const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", - "The build directory needs to be at the same level as the source directory."); - - results.append(Task(Task::Warning, msg, FileName(), -1, - ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); - } - return results; } |