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/qdeclarativeview/tst_qdeclarativeview.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/qdeclarativeview/tst_qdeclarativeview.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp index 4562ea3f..8308cd52 100644 --- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp @@ -276,7 +276,7 @@ void tst_QDeclarativeView::resizemodegraphicswidget() delete canvas; } -static void silentErrorsMsgHandler(QtMsgType, const char *) +static void silentErrorsMsgHandler(QtMsgType, const QMessageLogContext &, const QString &) { } @@ -284,9 +284,9 @@ void tst_QDeclarativeView::errors() { QDeclarativeView *canvas = new QDeclarativeView; QVERIFY(canvas); - QtMsgHandler old = qInstallMsgHandler(silentErrorsMsgHandler); + QtMessageHandler old = qInstallMessageHandler(silentErrorsMsgHandler); canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/error1.qml")); - qInstallMsgHandler(old); + qInstallMessageHandler(old); QVERIFY(canvas->status() == QDeclarativeView::Error); QVERIFY(canvas->errors().count() == 1); delete canvas; |