From 8fcfd7f59136be08bb418b9f26910af8405faf13 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 18 Sep 2021 13:41:19 +0200 Subject: [PATCH] Eat expected warning messages in QGuiApplication test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Verifies that we get the messages we want, and makes it easier to see relevant debug output. Pick-to: 6.2 Change-Id: Ide92959b120f325badbf200236cdc85f72226e1e Reviewed-by: Tor Arne Vestbø --- .../gui/kernel/qguiapplication/tst_qguiapplication.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index 2aab336bcc..c8fedbf8fc 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -1114,16 +1114,23 @@ void tst_QGuiApplication::staticFunctions() QGuiApplication::setWindowIcon(QIcon()); QGuiApplication::windowIcon(); QGuiApplication::platformName(); + QTest::ignoreMessage(QtWarningMsg, "Must construct a QGuiApplication first."); QGuiApplication::modalWindow(); QGuiApplication::focusWindow(); QGuiApplication::focusObject(); QGuiApplication::primaryScreen(); QGuiApplication::screens(); + QTest::ignoreMessage(QtWarningMsg, "Must construct a QGuiApplication first."); QGuiApplication::overrideCursor(); + QTest::ignoreMessage(QtWarningMsg, "Must construct a QGuiApplication first."); QGuiApplication::setOverrideCursor(QCursor()); + QTest::ignoreMessage(QtWarningMsg, "Must construct a QGuiApplication first."); QGuiApplication::changeOverrideCursor(QCursor()); + QTest::ignoreMessage(QtWarningMsg, "Must construct a QGuiApplication first."); QGuiApplication::restoreOverrideCursor(); + QTest::ignoreMessage(QtWarningMsg, "Must construct a QGuiApplication first."); QGuiApplication::keyboardModifiers(); + QTest::ignoreMessage(QtWarningMsg, "Must construct a QGuiApplication first."); QGuiApplication::queryKeyboardModifiers(); QGuiApplication::mouseButtons(); QGuiApplication::setLayoutDirection(Qt::LeftToRight); @@ -1133,11 +1140,13 @@ void tst_QGuiApplication::staticFunctions() QGuiApplication::desktopSettingsAware(); QGuiApplication::inputMethod(); QGuiApplication::platformNativeInterface(); + QTest::ignoreMessage(QtWarningMsg, "QGuiApplication::platformFunction(): Must construct a QGuiApplication before accessing a platform function"); QGuiApplication::platformFunction(QByteArrayLiteral("bla")); QGuiApplication::setQuitOnLastWindowClosed(true); QGuiApplication::quitOnLastWindowClosed(); QGuiApplication::applicationState(); + QTest::ignoreMessage(QtWarningMsg, "QPixmap: QGuiApplication must be created before calling defaultDepth()."); QPixmap::defaultDepth(); }