slash the -fast configure option

it's completely broken, and i have no time to fix it properly now.
configure runs no qmake -r by default any more, so it's fast enough.

Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

2 files changed, 2 insertions, 97 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 88f7acfb5b..df0f82532e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -210,7 +210,6 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "BUILD_QMAKE" ]     = "yes";
     dictionary[ "VCPROJFILES" ]     = "yes";
     dictionary[ "QMAKE_INTERNAL" ]  = "no";
-    dictionary[ "FAST" ]            = "no";
     dictionary[ "PROCESS" ]         = "partial";
     dictionary[ "WIDGETS" ]         = "yes";
     dictionary[ "RTTI" ]            = "yes";
@@ -802,11 +801,6 @@ void Configure::parseCmdLine()
             dictionary[ "NATIVE_GESTURES" ] = "no";
 #if !defined(EVAL)
         // Others ---------------------------------------------------
-        else if (configCmdLine.at(i) == "-fast")
-            dictionary[ "FAST" ] = "yes";
-        else if (configCmdLine.at(i) == "-no-fast")
-            dictionary[ "FAST" ] = "no";
-
         else if (configCmdLine.at(i) == "-widgets")
             dictionary[ "WIDGETS" ] = "yes";
         else if (configCmdLine.at(i) == "-no-widgets")
@@ -1649,11 +1643,6 @@ bool Configure::displayHelp()
         desc("LTCG", "yes",   "-ltcg",                  "Use Link Time Code Generation. (Release builds only)");
         desc("LTCG", "no",    "-no-ltcg",               "Do not use Link Time Code Generation.\n");
 
-        desc("FAST", "no",      "-no-fast",             "Configure Qt normally by generating Makefiles for all project files.");
-        desc("FAST", "yes",     "-fast",                "Configure Qt quickly by generating Makefiles only for library and "
-                                                        "subdirectory targets.  All other Makefiles are created as wrappers "
-                                                        "which will in turn run qmake.\n");
-
         desc(                   "-make <part>",         "Add part to the list of parts to be built at make time");
         for (int i=0; i<defaultBuildParts.size(); ++i)
             desc(               "",                     qPrintable(QString("  %1").arg(defaultBuildParts.at(i))), false, ' ');
@@ -1790,7 +1779,7 @@ bool Configure::displayHelp()
 
         desc("PROCESS", "partial", "-process",          "Generate top-level Makefiles/Project files.");
         desc("PROCESS", "full", "-fully-process",       "Generate Makefiles/Project files for the entire Qt\ntree.");
-        desc("PROCESS", "no", "-dont-process",          "Do not generate Makefiles/Project files. This will override -no-fast if specified.\n");
+        desc("PROCESS", "no", "-dont-process",          "Do not generate Makefiles/Project files.\n");
 
         desc("RTTI", "no",      "-no-rtti",             "Do not compile runtime type information.");
         desc("RTTI", "yes",     "-rtti",                "Compile runtime type information.");
@@ -3755,43 +3744,6 @@ void Configure::buildQmake()
 }
 #endif
 
-void Configure::findProjects(const QString& dirName)
-{
-    if (dictionary[ "PROCESS" ] != "no") {
-        QDir dir(dirName);
-        QString entryName;
-        int makeListNumber;
-        ProjectType qmakeTemplate;
-        const QFileInfoList &list = dir.entryInfoList(QStringList(QLatin1String("*.pro")),
-                                                      QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
-        for (int i = 0; i < list.size(); ++i) {
-            const QFileInfo &fi = list.at(i);
-            if (fi.fileName() != "qmake.pro") {
-                entryName = dirName + "/" + fi.fileName();
-                if (fi.isDir()) {
-                    findProjects(entryName);
-                } else {
-                    qmakeTemplate = projectType(fi.absoluteFilePath());
-                    switch (qmakeTemplate) {
-                    case Lib:
-                    case Subdirs:
-                        makeListNumber = 1;
-                        break;
-                    default:
-                        makeListNumber = 2;
-                        break;
-                    }
-                    makeList[makeListNumber].append(new MakeItem(sourceDir.relativeFilePath(fi.absolutePath()),
-                                                    fi.fileName(),
-                                                    "Makefile",
-                                                    qmakeTemplate));
-                }
-            }
-
-        }
-    }
-}
-
 void Configure::appendMakeItem(int inList, const QString &item)
 {
     QString dir;
@@ -3813,9 +3765,8 @@ void Configure::generateMakefiles()
         if (spec != "win32-msvc.net" && !spec.startsWith("win32-msvc2") && !spec.startsWith(QLatin1String("wince")))
             dictionary[ "VCPROJFILES" ] = "no";
 
-        int i = 0;
         QString pwd = QDir::currentPath();
-        if (dictionary["FAST"] != "yes") {
+        {
             QString dirName;
             bool generate = true;
             bool doDsp = (dictionary["VCPROJFILES"] == "yes");
@@ -3848,51 +3799,6 @@ void Configure::generateMakefiles()
                     dictionary[ "DONE" ] = "error";
                 }
             }
-        } else {
-            findProjects(sourcePath);
-            for (i=0; i<3; i++) {
-                for (int j=0; j<makeList[i].size(); ++j) {
-                    MakeItem *it=makeList[i][j];
-                    if (it->directory == "tools/configure")
-                        continue; // don't overwrite our own Makefile
-
-                    QString dirPath = it->directory + '/';
-                    QString projectName = it->proFile;
-                    QString makefileName = buildPath + "/" + dirPath + it->target;
-
-                    // For shadowbuilds, we need to create the path first
-                    QDir buildPathDir(buildPath);
-                    if (sourcePath != buildPath && !buildPathDir.exists(dirPath))
-                        buildPathDir.mkpath(dirPath);
-
-                    QStringList args;
-
-                    args << QDir::toNativeSeparators(buildPath + "/bin/qmake.exe");
-                    args << sourcePath + "/" + dirPath + projectName;
-
-                    cout << "For " << qPrintable(QDir::toNativeSeparators(dirPath + projectName)) << endl;
-                    args << "-o";
-                    args << it->target;
-
-                    QDir::setCurrent(dirPath);
-
-                    QFile file(makefileName);
-                    if (!file.open(QFile::WriteOnly | QFile::Text)) {
-                        printf("failed on dirPath=%s, makefile=%s\n",
-                               qPrintable(QDir::toNativeSeparators(dirPath)),
-                               qPrintable(QDir::toNativeSeparators(makefileName)));
-                        continue;
-                    }
-                    QTextStream txt(&file);
-                    txt << "all:\n";
-                    txt << "\t" << args.join(' ') << "\n";
-                    txt << "\t$(MAKE) -$(MAKEFLAGS) -f " << it->target << "\n";
-                    txt << "first: all\n";
-                    txt << "qmake: FORCE\n";
-                    txt << "\t" << args.join(' ') << "\n";
-                    txt << "FORCE:\n";
-                }
-            }
         }
         QDir::setCurrent(pwd);
     } else {
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index dc79e3ff58..3f4987f689 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -85,7 +85,6 @@ public:
     void generateSystemVars();
 #endif
     void showSummary();
-    void findProjects( const QString& dirName );
     QString firstLicensePath();
 
 #if !defined(EVAL)