summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-06-29 05:01:55 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-06-29 05:21:09 (GMT)
commit86c1e689a17b1657ad20b58e999a2925001e100b (patch)
tree33e1abff9a74baecdaf7d45fe3f5b1614a90048d /tools/configure
parent157b2ee3f49fd6085e61965b1f1a239c569a4fea (diff)
downloadQt-86c1e689a17b1657ad20b58e999a2925001e100b.zip
Qt-86c1e689a17b1657ad20b58e999a2925001e100b.tar.gz
Qt-86c1e689a17b1657ad20b58e999a2925001e100b.tar.bz2
Fixed configure.exe exiting with 0 exit code even if building host tools (moc, uic etc) fails.
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 4f379d7..0e13c7a 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -92,15 +92,15 @@ int runConfigure( int argc, char** argv )
app.generateHeaders();
if( !app.isDone() )
app.buildQmake();
- if( !app.isOk() )
- return 2;
#endif
if( !app.isDone() )
app.generateMakefiles();
- if( app.isOk() )
+ if( !app.isDone() && app.isOk() )
app.buildHostTools();
if( !app.isDone() )
app.showSummary();
+ if( !app.isOk() )
+ return 2;
return 0;
}