From 70970ad9814ca2c20b008f40fd70067bc2ce749f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 14 Jul 2016 16:41:09 +0200
Subject: [PATCH] don't mention config.log in error messages when not
 applicable

Change-Id: I127bc23c667d337bbe2518e7364ca99db9a3163a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 mkspecs/features/qt_configure.prf | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 82103125d2..aea93f8d08 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -24,6 +24,10 @@ defineTest(qtConfAddWarning) {
 defineTest(qtConfAddError) {
     QT_CONFIGURE_ERRORS += "ERROR: $$join(1, $$escape_expand(\\n))"
     export(QT_CONFIGURE_ERRORS)
+    equals(2, log) {
+        CONFIG += mention_config_log
+        export(CONFIG)
+    }
 }
 
 defineTest(qtConfCommandlineSetInput) {
@@ -665,7 +669,7 @@ defineReplace(qtConfCheckSingleCondition) {
 
     !$$result {
         $${3} {
-            qtConfAddError("Feature '$${1}' was enabled, but the pre-condition '$$2' failed.")
+            qtConfAddError("Feature '$${1}' was enabled, but the pre-condition '$$2' failed.", log)
             $$result = true
         }
     }
@@ -814,7 +818,7 @@ defineTest(qtConfReport_warning) {
 }
 
 defineTest(qtConfReport_error) {
-    qtConfAddError($${1})
+    qtConfAddError($${1}, log)
 }
 
 defineTest(qtConfCreateReportRecurse) {
@@ -895,7 +899,7 @@ defineTest(qtConfPrintReport) {
     !isEmpty(QT_CONFIGURE_ERRORS) {
         for (e, QT_CONFIGURE_ERRORS): \
             logn($$e)
-        !$$QMAKE_CONFIG_VERBOSE: logn("Check config.log for details.")
+        mention_config_log:!$$QMAKE_CONFIG_VERBOSE: logn("Check config.log for details.")
         logn(" ")
 
         !equals(config.input.continue, yes): \