lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2025-12-21 07:28:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check for a non-error, non-continue case.

Browse Source 
There is at least one case in configure where it exist with a code of 0
but does not create .qmake.cache. Detect this and avoid continuing.

Change-Id: I0554991e5d4a50b7072494c080fa2c593e03b726
Reviewed-on: http://codereview.qt-project.org/6094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Lincoln Ramsay
2011-10-06 10:17:47 +10:00
committed by Qt by Nokia
parent 59621329f1
commit 6bd52260c8
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -51,8 +51,18 @@ if (! -e "$relpath/qtbase/configure") {
ensureDir("$outpath/qtbase");
chdir("$outpath/qtbase");
if (-e ".qmake.cache") {
# Remove this so we can detect if configure finished properly
unlink ".qmake.cache";
}
my $ret = system_v("$relpath/qtbase/configure @ARGV");
exit $ret unless ($ret == 0);
if (! -e ".qmake.cache") {
# Even though there was no error code, this file wasn't created
# so configure didn't finish properly. This is probaby because
# the user passed -help
exit 0;
}
chdir("$outpath");