diff --git a/src/tools/moc/parser.cpp b/src/tools/moc/parser.cpp index c0591b69c0..4c754786f7 100644 --- a/src/tools/moc/parser.cpp +++ b/src/tools/moc/parser.cpp @@ -64,10 +64,10 @@ void Parser::error(int rollback) { } void Parser::error(const char *msg) { if (msg || error_msg) - qWarning(ErrorFormatString "Error: %s", + fprintf(stderr, ErrorFormatString "Error: %s\n", currentFilenames.top().constData(), symbol().lineNum, msg?msg:error_msg); else - qWarning(ErrorFormatString "Parse error at \"%s\"", + fprintf(stderr, ErrorFormatString "Parse error at \"%s\"\n", currentFilenames.top().constData(), symbol().lineNum, symbol().lexem().data()); exit(EXIT_FAILURE); } diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 3cd2f1f936..e0179b393b 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -1734,6 +1734,11 @@ void tst_Moc::warnings() #endif QProcess proc; + + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("QT_MESSAGE_PATTERN", "no qDebug or qWarning please"); + proc.setProcessEnvironment(env); + proc.start("moc", args); QVERIFY(proc.waitForStarted());