From 1aaeb9538b8f001cee80eef75a15176e0d3910ed Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 17 Jun 2013 11:21:40 +0200
Subject: complain about bad arguments to -make/-nomake

Task-number: QTBUG-5366
Change-Id: I461a6c85fcee4a0216571d294171652b05ee6a34
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 tools/configure/configureapp.cpp | 16 ++++++++++++++--
 tools/configure/configureapp.h   |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 50e491f20c..0ac3730b4e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -171,6 +171,8 @@ Configure::Configure(int& argc, char** argv)
     }
 
     defaultBuildParts << QStringLiteral("libs") << QStringLiteral("tools") << QStringLiteral("examples");
+    allBuildParts = defaultBuildParts;
+    allBuildParts << QStringLiteral("tests");
     dictionary[ "QT_SOURCE_TREE" ]    = sourcePath;
     dictionary[ "QT_BUILD_TREE" ]     = buildPath;
     dictionary[ "QT_INSTALL_PREFIX" ] = installPath;
@@ -1001,12 +1003,22 @@ void Configure::parseCmdLine()
             ++i;
             if (i == argCount)
                 break;
-            buildParts += configCmdLine.at(i);
+            QString part = configCmdLine.at(i);
+            if (!allBuildParts.contains(part)) {
+                cout << "Unknown part " << part << " passed to -make." << endl;
+                dictionary["DONE"] = "error";
+            }
+            buildParts += part;
         } else if (configCmdLine.at(i) == "-nomake") {
             ++i;
             if (i == argCount)
                 break;
-            nobuildParts.append(configCmdLine.at(i));
+            QString part = configCmdLine.at(i);
+            if (!allBuildParts.contains(part)) {
+                cout << "Unknown part " << part << " passed to -nomake." << endl;
+                dictionary["DONE"] = "error";
+            }
+            nobuildParts += part;
         }
 
         else if (configCmdLine.at(i) == "-skip") {
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 3014e409f9..8f95e1fb95 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -104,6 +104,7 @@ private:
 
     // Our variable dictionaries
     QMap<QString,QString> dictionary;
+    QStringList allBuildParts;
     QStringList defaultBuildParts;
     QStringList buildParts;
     QStringList nobuildParts;
-- 
cgit v1.2.3