summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure4
-rw-r--r--tools/configure/configureapp.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index 5575ecb6a0..7bb32db7ba 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 d19d34e54e..58ec3bf001 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";