1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add/unify progress messages to/from the configures

Browse Source 
it's weird that the output from the two variants is differing, and that
after building qmake it appears to hang.

Change-Id: I2ac3ace11e958effe787b13e1300eb1d2839ae98
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-03-12 20:00:37 +01:00 committed by The Qt Project
parent 1b69786a3f
commit 0189cd123d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -3615,7 +3615,7 @@ setBootstrapVariable()
# build qmake # build qmake
if true; then ###[ '!' -f "$outpath/bin/qmake" ]; if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake. Please wait..." echo "Creating qmake..."
mkdir -p "$outpath/qmake" || exit mkdir -p "$outpath/qmake" || exit
# fix makefiles # fix makefiles
@ -3726,6 +3726,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
(cd "$outpath/qmake"; "$MAKE") || exit 2 (cd "$outpath/qmake"; "$MAKE") || exit 2
fi # Build qmake fi # Build qmake
echo "Running configuration tests..."
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# create a qt.conf for the Qt build tree itself # create a qt.conf for the Qt build tree itself
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

2
tools/configure/configureapp.cpp
View File

@ -2127,6 +2127,8 @@ bool Configure::checkAvailability(const QString &part)
*/ */
void Configure::autoDetection() void Configure::autoDetection()
{ {
cout << "Running configuration tests..." << endl;
if (dictionary["C++11"] == "auto") { if (dictionary["C++11"] == "auto") {
if (!dictionary["QMAKESPEC"].contains("msvc")) if (!dictionary["QMAKESPEC"].contains("msvc"))
dictionary["C++11"] = tryCompileProject("common/c++11") ? "yes" : "no"; dictionary["C++11"] = tryCompileProject("common/c++11") ? "yes" : "no";