Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 13 insertions, 3 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a899adb..39588e6 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3109,6 +3109,9 @@ void Configure::buildQmake()
 
 void Configure::buildHostTools()
 {
+    if (dictionary[ "NOPROCESS" ] == "yes")
+        dictionary[ "DONE" ] = "yes";
+
     if (!dictionary.contains("XQMAKESPEC"))
         return;
 
@@ -3332,7 +3335,6 @@ void Configure::generateMakefiles()
     } 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;
-        dictionary[ "DONE" ] = "yes";
         return;
     }
 }
@@ -3340,8 +3342,16 @@ void Configure::generateMakefiles()
 void Configure::showSummary()
 {
     QString make = dictionary[ "MAKE" ];
-    cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl;
-    cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
+    if (!dictionary.contains("XQMAKESPEC")) {
+        cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl;
+        cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
+    } else {
+        // we are cross compiling for Windows CE
+        cout << endl << endl << "Qt is now configured for building. To start the build run:" << endl
+             << "\tsetcepaths " << dictionary.value("XQMAKESPEC") << endl
+             << "\t" << qPrintable(make) << endl
+             << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
+    }
 }
 
 Configure::ProjectType Configure::projectType( const QString& proFileName )