Update QVariant tests

Remove old message handler hack as we have a new and better api to
ignore warning messages.

Change-Id: Id967b2672fe3e3638db9977500118a19c2afb730
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 431db86330..dc139cfa94 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -145,18 +145,16 @@ void tst_QGuiVariant::constructor_invalid()
 
     QFETCH(uint, typeId);
     {
-        MessageHandlerInvalidType msg;
+        QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
         QVariant variant(static_cast<QVariant::Type>(typeId));
         QVERIFY(!variant.isValid());
         QVERIFY(variant.userType() == QMetaType::UnknownType);
-        QVERIFY(msg.ok);
     }
     {
-        MessageHandlerInvalidType msg;
+        QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
         QVariant variant(typeId, /* copy */ 0);
         QVERIFY(!variant.isValid());
         QVERIFY(variant.userType() == QMetaType::UnknownType);
-        QVERIFY(msg.ok);
     }
 }