3 files changed, 4 insertions, 23 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index cc46fb99cb..bf2d7aa8a7 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1015,35 +1015,21 @@ void Configure::configure()
 
     QStringList args;
     args << buildPath + "/bin/qmake"
-         << "-o" << "Makefile.cfg"
-         << sourcePath + "/configure.pri"
+         << sourcePathMangled
          << "--" << configCmdLine;
 
+    QString pwd = QDir::currentPath();
+    QDir::setCurrent(buildPathMangled);
     if (int exitCode = Environment::execute(args, QStringList(), QStringList())) {
         cout << "Qmake failed, return code " << exitCode  << endl << endl;
         dictionary[ "DONE" ] = "error";
     }
+    QDir::setCurrent(pwd);
 
     if ((dictionary["REDO"] != "yes") && (dictionary["DONE"] != "error"))
         saveCmdLine();
 }
 
-void Configure::generateMakefiles()
-{
-        QString pwd = QDir::currentPath();
-        {
-            QStringList args;
-            args << buildPath + "/bin/qmake" << sourcePathMangled;
-
-            QDir::setCurrent(buildPathMangled);
-            if (int exitCode = Environment::execute(args, QStringList(), QStringList())) {
-                cout << "Qmake failed, return code " << exitCode  << endl << endl;
-                dictionary[ "DONE" ] = "error";
-            }
-        }
-        QDir::setCurrent(pwd);
-}
-
 bool Configure::showLicense(QString orgLicenseFile)
 {
     if (dictionary["LICENSE_CONFIRMED"] == "yes") {
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 436c9307b1..b1c6ea9181 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -51,7 +51,6 @@ public:
     void configure();
 
     void generateHeaders();
-    void generateMakefiles();
     void generateQDevicePri();
     void prepareConfigTests();
 
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index ac521f42e4..91a99c16c2 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -80,10 +80,6 @@ int runConfigure( int argc, char** argv )
     if (!app.isOk())
         return 3;
 
-    app.generateMakefiles();
-    if( !app.isOk() )
-        return 2;
-
     return 0;
 }