summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-23 14:55:29 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-23 15:07:41 (GMT)
commit3ce677f1375bc723b5fd5a11ccc21f2af0c45ca1 (patch)
treee7cacb7cbbe50778032361e8807d3f5eb010ae6f /tools
parent6ac3cbc61a1fc80df0bac755028037586f1fdc3d (diff)
downloadQt-3ce677f1375bc723b5fd5a11ccc21f2af0c45ca1.zip
Qt-3ce677f1375bc723b5fd5a11ccc21f2af0c45ca1.tar.gz
Qt-3ce677f1375bc723b5fd5a11ccc21f2af0c45ca1.tar.bz2
configure shows Windows CE specific build steps when its done
For cross compilation of Qt for Windows CE the user must call setcepaths before nmake. Now configure shows a helpful message if the xplatform configure switch was used. Task-number: 257352 Reviewed-by: thartman
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ae6ebab..39588e6 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3342,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 )