diff options
| author | Adam Strzelecki <ono@java.pl> | 2014-04-03 18:46:15 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2014-04-10 15:56:17 +0200 |
| commit | a01151c5e0ffd4b3deb9092747f907971ca18d91 (patch) | |
| tree | 94e44289c34a3f696f3be43bcbc1c43d8b956f9e /src | |
| parent | cf618464d2c9f2a9f9a3db0b41b556e3cd4ef6ae (diff) | |
| download | qt-creator-a01151c5e0ffd4b3deb9092747f907971ca18d91.tar.gz | |
Consider build below source valid for latest Qmake
This shows "Qmake does not support build directories below the source
directory." only when using Qmake/Kit older than 5.2. This will resolve
complaints about artificial requirement to keep build out of source folder
which produces clutter on disk when working with multiple Qt projects.
Task-number: QTCREATORBUG-10024
Change-Id: Ib05c78f4e8f55eb71e94d255f74543d31f2d569f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 3ded2c6b24..91cf71dfde 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1172,7 +1172,7 @@ QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QStrin const QChar slash = QLatin1Char('/'); if (!sourcePath.endsWith(slash)) sourcePath.append(slash); - if ((tmpBuildDir.startsWith(sourcePath)) && (tmpBuildDir != sourcePath)) { + if ((tmpBuildDir.startsWith(sourcePath)) && (tmpBuildDir != sourcePath) && qtVersion() < QtVersionNumber(5, 2, 0)) { const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", "Qmake does not support build directories below the source directory."); results.append(Task(Task::Warning, msg, FileName(), -1, |