whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't mention config.log in error messages when not applicable 

Change-Id: I127bc23c667d337bbe2518e7364ca99db9a3163a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Oswald Buddenhagen 2016-07-14 16:41:09 +02:00
parent 09110cdbea
commit 70970ad981
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkspecs/features/qt_configure.prf
View File

@ -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): \