From 0189cd123dde5bf93adb1b26e68ece5674551724 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 12 Mar 2013 20:00:37 +0100
Subject: [PATCH] add/unify progress messages to/from the configures
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>
---
configure | 4 +++-
tools/configure/configureapp.cpp | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 5575ecb6a0f..7bb32db7ba6 100755
--- a/configure
+++ b/configure
@@ -3615,7 +3615,7 @@ setBootstrapVariable()
# build qmake
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
- echo "Creating qmake. Please wait..."
+ echo "Creating qmake..."
mkdir -p "$outpath/qmake" || exit
# fix makefiles
@@ -3726,6 +3726,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
(cd "$outpath/qmake"; "$MAKE") || exit 2
fi # Build qmake
+echo "Running configuration tests..."
+
#-------------------------------------------------------------------------------
# create a qt.conf for the Qt build tree itself
#-------------------------------------------------------------------------------
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index d19d34e54ee..58ec3bf001a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2127,6 +2127,8 @@ bool Configure::checkAvailability(const QString &part)
*/
void Configure::autoDetection()
{
+ cout << "Running configuration tests..." << endl;
+
if (dictionary["C++11"] == "auto") {
if (!dictionary["QMAKESPEC"].contains("msvc"))
dictionary["C++11"] = tryCompileProject("common/c++11") ? "yes" : "no";
--
GitLab