lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 11:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 6bd52260c8.
Running configure -help should not break builds by removing
.qmake.cache.

Change-Id: I9754ea891a445a9b67a1f9ad0adac85cb36338fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Jonathan Liu
2012-09-23 14:51:37 +10:00
committed by The Qt Project
parent 58acd59fa6
commit 600b295f2c
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -90,21 +90,11 @@ 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");
if ($ret != 0) {
print "*** qtbase/configure exited with non-zero status.\n";
exit ($ret>>8) ;
}
if (! -e ".qmake.cache") {
# Even though there was no error code, this file wasn't created
# so configure didn't finish properly. This is probably because
# the user passed -help
exit 0;
}
chdir("$outpath");