diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-13 14:47:47 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 14:51:39 +0200 |
commit | aa6d27f043f0367ea4c16bb255f65b2a6abb5921 (patch) | |
tree | 663c468830121f3cd3abc8a85a9cae3a2b7a8311 /tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp | |
parent | cf5b6c3ef72df623117678de01fd5557861ba73b (diff) |
Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5.
Change-Id: I87f5f8d5b28afcbcf8a9c613d1d4b1199f5f4254
Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp index 23eb3f0d..ea6aaa34 100644 --- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp +++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp @@ -1089,7 +1089,7 @@ void tst_QDeclarativePositioners::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; @@ -1097,7 +1097,7 @@ void interceptWarnings(QtMsgType type, const char *msg) void tst_QDeclarativePositioners::test_conflictinganchors() { - QtMsgHandler oldMsgHandler = qInstallMsgHandler(interceptWarnings); + QtMessageHandler oldMsgHandler = qInstallMessageHandler(interceptWarnings); QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -1178,7 +1178,7 @@ void tst_QDeclarativePositioners::test_conflictinganchors() item = qobject_cast<QDeclarativeItem*>(component.create()); QVERIFY(item); QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow")); - qInstallMsgHandler(oldMsgHandler); + qInstallMessageHandler(oldMsgHandler); } void tst_QDeclarativePositioners::test_vertical_qgraphicswidget() |