diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-14 16:48:25 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-25 09:03:12 +0000 |
| commit | 9596d6790b37ecce967b3929a0c2b7134a2223ea (patch) | |
| tree | 4f46b06443da8398ff51012628c7ce3fa4fcd170 | |
| parent | a826f5c6f61cc52a88966aea902a3fe8926b0282 (diff) | |
| download | qt-creator-9596d6790b37ecce967b3929a0c2b7134a2223ea.tar.gz | |
print no message at all when no argument is supplied to error()
this is useful when an adequate message has already been emitted by
other means, like various built-ins do.
Change-Id: I092771f55969fad8b214204d666327664727c572
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from qtbase/22d1351ddea193f5c00d4ae12229358dea826c62)
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 8ceebd9cf0..d177230256 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -1581,7 +1581,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( #ifdef PROEVALUATOR_FULL fputs(msg.toLatin1().constData(), stderr); #endif - } else { + } else if (!msg.isEmpty() || func_t != T_ERROR) { m_handler->fileMessage( (func_t == T_ERROR ? QMakeHandler::ErrorMessage : func_t == T_WARNING ? QMakeHandler::WarningMessage : |