diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-13 14:35:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 14:51:47 +0200 |
commit | 08444bab1bf25e20837ea47b647a5b1216caa05c (patch) | |
tree | 65fc2e90bbf29f22a92deb322bd4a9de939e8e17 /tests/auto/quick/qquickpositioners | |
parent | 75b9cd92dc5291ce12d8d609c5d721246044ffa0 (diff) |
Autotests: Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5.
Change-Id: Icb6423c7d9f7e507ba36376b0af5ad183379c494
Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
Diffstat (limited to 'tests/auto/quick/qquickpositioners')
-rw-r--r-- | tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp index 32ec41bb13..247c0d58f8 100644 --- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp @@ -1724,7 +1724,7 @@ void tst_qquickpositioners::test_flow_implicit_resize() QString warningMessage; -void interceptWarnings(QtMsgType type, const char *msg) +void interceptWarnings(QtMsgType type, const QMessageLogContext &, const QString &msg) { Q_UNUSED( type ); warningMessage = msg; @@ -1732,7 +1732,7 @@ void interceptWarnings(QtMsgType type, const char *msg) void tst_qquickpositioners::test_conflictinganchors() { - QtMsgHandler oldMsgHandler = qInstallMsgHandler(interceptWarnings); + QtMessageHandler oldMsgHandler = qInstallMessageHandler(interceptWarnings); QQmlEngine engine; QQmlComponent component(&engine); @@ -1826,7 +1826,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function.")); - qInstallMsgHandler(oldMsgHandler); + qInstallMessageHandler(oldMsgHandler); delete item; } |