nuke -process/-fully-process/-dont-process options

[ChangeLog][configure] The -process/-fully-process/-dont-process options
have been removed due to being unnecessary and counterproductive.

-fully-process has always been broken to a degree under unix (and since
5.0 under windows) - rcc isn't built before running qmake -r, so the
dependencies are unreliable (and there are many warning messages from
qmake).
also, it is a lot slower nowadays, as qmake -r is not parallelized.

-dont-process doesn't make any sense any more - even if you don't need
the Makefile for some obscure reason, the time spent on creating it is
not relevant without the recursion.

this leaves -process as the only option.

Task-number: QTBUG-36955
Change-Id: Ifd3949d9ff773780646c6f65db1629e1c19e53d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 2 insertions, 46 deletions

diff --git a/configure b/configure
index a6bd6c1bcb..e7ebd9f7b8 100755
--- a/configure
+++ b/configure
@@ -722,7 +722,6 @@ CFG_SILENT=no
 CFG_ALSA=auto
 CFG_PULSEAUDIO=auto
 CFG_COREWLAN=auto
-CFG_PROCESS=yes
 CFG_ICU=auto
 CFG_FORCE_ASSERTS=no
 CFG_PCRE=auto
@@ -2068,15 +2067,6 @@ while [ "$#" -gt 0 ]; do
     silent)
         CFG_SILENT="$VAL"
         ;;
-    dont-process)
-        CFG_PROCESS=no
-        ;;
-    process)
-        CFG_PROCESS=partial
-        ;;
-    fully-process)
-        CFG_PROCESS=full
-        ;;
     audio-backend)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             CFG_AUDIO_BACKEND="$VAL"
@@ -2275,10 +2265,6 @@ Configure options:
  *  -shared ............ Create and use shared Qt libraries.
     -static ............ Create and use static Qt libraries.
 
- *  -process ........... Generate only a top-level Makefile.
-    -fully-process ..... Generate Makefiles for the entire Qt tree.
-    -dont-process ...... Do not generate any Makefiles.
-
     -no-largefile ...... Disables large file support.
  +  -largefile ......... Enables Qt to access files larger than 4 GB.
 
@@ -6647,7 +6633,6 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
 # build makefiles based on the configuration
 #-------------------------------------------------------------------------------
 
-if [ "$CFG_PROCESS" != "no" ]; then
 (   # fork to make the cd stay local
 
     relpathMangled=$relpath
@@ -6656,16 +6641,9 @@ if [ "$CFG_PROCESS" != "no" ]; then
         cd ..
     fi
 
-    if [ "$CFG_PROCESS" = "full" ]; then
-        echo "Creating makefiles. Please wait..."
-        "$outpath/bin/qmake" -r "$relpathMangled"
-        echo "Done"
-    else
-        "$outpath/bin/qmake" "$relpathMangled"
-    fi
+    "$outpath/bin/qmake" "$relpathMangled"
 
 )
-fi
 
 #-------------------------------------------------------------------------------
 # check for platforms that we don't yet know about
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 9820ce1636..7c2a38292b 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -158,7 +158,6 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "EMBEDDED" ]        = "no";
     dictionary[ "BUILD_QMAKE" ]     = "yes";
     dictionary[ "QMAKE_INTERNAL" ]  = "no";
-    dictionary[ "PROCESS" ]         = "partial";
     dictionary[ "WIDGETS" ]         = "yes";
     dictionary[ "GUI" ]             = "yes";
     dictionary[ "RTTI" ]            = "yes";
@@ -943,13 +942,6 @@ void Configure::parseCmdLine()
         else if (configCmdLine.at(i) == "-qmake")
             dictionary[ "BUILD_QMAKE" ] = "yes";
 
-        else if (configCmdLine.at(i) == "-dont-process")
-            dictionary[ "PROCESS" ] = "no";
-        else if (configCmdLine.at(i) == "-process")
-            dictionary[ "PROCESS" ] = "partial";
-        else if (configCmdLine.at(i) == "-fully-process")
-            dictionary[ "PROCESS" ] = "full";
-
         else if (configCmdLine.at(i) == "-qtnamespace") {
             ++i;
             if (i == argCount)
@@ -1948,10 +1940,6 @@ bool Configure::displayHelp()
         desc("BUILD_QMAKE", "no", "-no-qmake",          "Do not compile qmake.");
         desc("BUILD_QMAKE", "yes", "-qmake",            "Compile qmake.\n");
 
-        desc("PROCESS", "partial", "-process",          "Generate only top-level Makefile.");
-        desc("PROCESS", "full", "-fully-process",       "Generate Makefiles for the entire Qt tree.");
-        desc("PROCESS", "no", "-dont-process",          "Do not generate Makefiles.\n");
-
         desc(                  "-qreal [double|float]", "typedef qreal to the specified type. The default is double.\n"
                                                         "Note that changing this flag affects binary compatibility.\n");
 
@@ -4157,7 +4145,6 @@ void Configure::appendMakeItem(int inList, const QString &item)
 
 void Configure::generateMakefiles()
 {
-    if (dictionary[ "PROCESS" ] != "no") {
         QString pwd = QDir::currentPath();
         {
             QString sourcePathMangled = sourcePath;
@@ -4167,24 +4154,15 @@ void Configure::generateMakefiles()
                 buildPathMangled = QFileInfo(buildPath).path();
             }
             QStringList args;
-            args << buildPath + "/bin/qmake";
-            if (dictionary[ "PROCESS" ] == "full")
-                args << "-r";
-            args << sourcePathMangled;
+            args << buildPath + "/bin/qmake" << sourcePathMangled;
 
             QDir::setCurrent(buildPathMangled);
-            cout << "Generating Makefiles...\n";
             if (int exitCode = Environment::execute(args, QStringList(), QStringList())) {
                 cout << "Qmake failed, return code " << exitCode  << endl << endl;
                 dictionary[ "DONE" ] = "error";
             }
         }
         QDir::setCurrent(pwd);
-    } else {
-        cout << "Processing of project files have been disabled." << endl;
-        cout << "Only use this option if you really know what you're doing." << endl << endl;
-        return;
-    }
 }
 
 void Configure::showSummary()