1 files changed, 3 insertions, 27 deletions
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index d4f654150e..91a99c16c2 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -42,11 +42,8 @@ int runConfigure( int argc, char** argv )
         return 3;
 
     app.parseCmdLine();
-    app.validateArgs();
     if (!app.isOk())
         return 3;
-    if( app.displayHelp() )
-        return 1;
 
     // Read license now, and exit if it doesn't pass.
     // This lets the user see the command-line options of configure
@@ -78,32 +75,11 @@ int runConfigure( int argc, char** argv )
     if (!app.isOk())
         return 3;
 
-    // Auto-detect modules and settings.
-    app.autoDetection();
-
-    // After reading all command-line arguments, and doing all the
-    // auto-detection, it's time to do some last minute validation.
-    // If the validation fails, we cannot continue.
-    if (!app.verifyConfiguration())
+    // run qmake based configure
+    app.configure();
+    if (!app.isOk())
         return 3;
 
-    app.generateOutputVars();
-
-    if( !app.isDone() )
-        app.generateCachefile();
-    if( !app.isDone() )
-        app.generateConfigfiles();
-    if (!app.isDone())
-        app.generateQConfigPri();
-    if (!app.isDone())
-        app.displayConfig();
-    if( !app.isDone() )
-        app.generateMakefiles();
-    if( !app.isDone() )
-        app.showSummary();
-    if( !app.isOk() )
-        return 2;
-
     return 0;
 }