3 files changed, 23 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index d9e3340c70..af470939e9 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1011,6 +1011,20 @@ void Configure::parseCmdLine()
             nobuildParts.append(configCmdLine.at(i));
         }
 
+        else if (configCmdLine.at(i) == "-skip") {
+            ++i;
+            if (i == argCount)
+                break;
+            QString mod = configCmdLine.at(i);
+            if (!mod.startsWith(QStringLiteral("qt")))
+                mod.insert(0, QStringLiteral("qt"));
+            if (!QFileInfo(sourcePath + "/../" + mod).isDir()) {
+                cout << "Attempting to skip non-existent module " << mod << "." << endl;
+                dictionary["DONE"] = "error";
+            }
+            skipModules += mod;
+        }
+
         // Directories ----------------------------------------------
         else if (configCmdLine.at(i) == "-prefix") {
             ++i;
@@ -1647,6 +1661,8 @@ bool Configure::displayHelp()
             desc(               "",                     qPrintable(QString("  %1").arg(defaultBuildParts.at(i))), false, ' ');
         desc(                   "-nomake <part>",       "Exclude part from the list of parts to be built.\n");
 
+        desc(                   "-skip <module>",       "Exclude an entire module from the build.\n");
+
         desc("WIDGETS", "no", "-no-widgets",            "Disable Qt Widgets module.\n");
 
         desc("ACCESSIBILITY", "no", "-no-accessibility", "Disable accessibility support.\n");
@@ -2778,7 +2794,10 @@ void Configure::generateCachefile()
     if (moduleFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
         QTextStream moduleStream(&moduleFile);
 
-        moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl << endl;
+        moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl;
+        if (!skipModules.isEmpty())
+            moduleStream << "QT_SKIP_MODULES += " << skipModules.join(' ') << endl;
+        moduleStream << endl;
 
         if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")
             moduleStream << "DEFINES        *= QT_EDITION=QT_EDITION_DESKTOP" << endl;
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 271a384be7..3cb5de8520 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -116,6 +116,7 @@ private:
     QStringList defaultBuildParts;
     QStringList buildParts;
     QStringList nobuildParts;
+    QStringList skipModules;
     QStringList licensedModules;
     QStringList allSqlDrivers;
     QStringList allConfigs;
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 1b402b1a59..c4154c8f38 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -58,6 +58,8 @@ int runConfigure( int argc, char** argv )
 #if !defined(EVAL)
     app.validateArgs();
 #endif
+    if (!app.isOk())
+        return 3;
     if( app.displayHelp() )
 	return 1;