diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-23 17:43:32 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-23 17:43:32 (GMT) |
| commit | 9ec431c161202d9f06f3a7c59181cb0ab523958a (patch) | |
| tree | cbf1b4a23c14821f1c6fb26b64b5950f32279409 /tools/configure/configureapp.cpp | |
| parent | 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2 (diff) | |
| parent | 2410f261eaa13442baa46537202d31ad26d797e7 (diff) | |
| download | Qt-9ec431c161202d9f06f3a7c59181cb0ab523958a.zip Qt-9ec431c161202d9f06f3a7c59181cb0ab523958a.tar.gz Qt-9ec431c161202d9f06f3a7c59181cb0ab523958a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 61daca8..39588e6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3109,7 +3109,9 @@ void Configure::buildQmake() void Configure::buildHostTools() { - dictionary[ "DONE" ] = "yes"; + if (dictionary[ "NOPROCESS" ] == "yes") + dictionary[ "DONE" ] = "yes"; + if (!dictionary.contains("XQMAKESPEC")) 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 ) |