summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-21 11:48:25 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-21 11:50:10 (GMT)
commit08b3511a0c20cfbfdec91e547a2592afce67f0e6 (patch)
treeaec7ed061ce6d64c54e2646108e0c6c44050eeae
parent31e358f2290c145b839fc5b7b277922c1ab6e19b (diff)
downloadQt-08b3511a0c20cfbfdec91e547a2592afce67f0e6.zip
Qt-08b3511a0c20cfbfdec91e547a2592afce67f0e6.tar.gz
Qt-08b3511a0c20cfbfdec91e547a2592afce67f0e6.tar.bz2
configure -dont-process must build the host tools on Windows CE
Reviewed-by: mauricek
-rw-r--r--configure.exebin1102848 -> 1131520 bytes
-rw-r--r--tools/configure/configureapp.cpp2
-rw-r--r--tools/configure/main.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/configure.exe b/configure.exe
index b4b7c50..14eaef4 100644
--- a/configure.exe
+++ b/configure.exe
Binary files differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a899adb..61daca8 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3109,6 +3109,7 @@ void Configure::buildQmake()
void Configure::buildHostTools()
{
+ dictionary[ "DONE" ] = "yes";
if (!dictionary.contains("XQMAKESPEC"))
return;
@@ -3332,7 +3333,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;
}
}
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 0e13c7a..e5c04cc 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -95,7 +95,7 @@ int runConfigure( int argc, char** argv )
#endif
if( !app.isDone() )
app.generateMakefiles();
- if( !app.isDone() && app.isOk() )
+ if( !app.isDone() )
app.buildHostTools();
if( !app.isDone() )
app.showSummary();