summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@nokia.com>2011-11-21 17:36:00 +0100
committerTobias Hunger <tobias.hunger@nokia.com>2011-11-22 12:48:23 +0100
commitd530e8ddb888fde70863f303843b512aa3f7762a (patch)
treeb67bcb949d05eefb4e4d29581d59582e4b8f44ba
parent751ac3fb85585273ddb85bcf8ecec80de99d961b (diff)
downloadqt-creator-d530e8ddb888fde70863f303843b512aa3f7762a.tar.gz
Don't offer Makefile.Debug and Makefile.Release for importing
Task-number: QTCREATORBUG-6562 Change-Id: I1630d7c13ab59d848626a4a4b8fb542765a16d6e Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
-rw-r--r--src/plugins/qtsupport/qtversionmanager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 8c7cfbe0f8..b33a8ee27b 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -743,6 +743,10 @@ QtVersionManager::MakefileCompatible QtVersionManager::makefileIsFor(const QStri
if (proFile.isEmpty())
return CouldNotParse;
+ // The Makefile.Debug / Makefile.Release lack a # Command: line
+ if (findQMakeLine(makefile, QLatin1String("# Command:")).trimmed().isEmpty())
+ return CouldNotParse;
+
QString line = findQMakeLine(makefile, QLatin1String("# Project:")).trimmed();
if (line.isEmpty())
return CouldNotParse;