summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeviewer
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-13 14:47:47 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-14 14:51:39 +0200
commitaa6d27f043f0367ea4c16bb255f65b2a6abb5921 (patch)
tree663c468830121f3cd3abc8a85a9cae3a2b7a8311 /tests/auto/declarative/qdeclarativeviewer
parentcf5b6c3ef72df623117678de01fd5557861ba73b (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/qdeclarativeviewer')
-rw-r--r--tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
index 35d2a24f..23e6dd95 100644
--- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
+++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
@@ -239,21 +239,21 @@ void tst_QDeclarativeViewer::loading()
}
static int numberOfWarnings = 0;
-static void checkWarnings(QtMsgType, const char *)
+static void checkWarnings(QtMsgType, const QMessageLogContext &, const QString &)
{
numberOfWarnings++;
}
void tst_QDeclarativeViewer::fileBrowser()
{
- QtMsgHandler previousMsgHandler = qInstallMsgHandler(checkWarnings);
+ QtMessageHandler previousMsgHandler = qInstallMessageHandler(checkWarnings);
QDeclarativeViewer *viewer = new QDeclarativeViewer();
QVERIFY(viewer);
viewer->setUseNativeFileBrowser(false);
viewer->openFile();
viewer->show();
QCoreApplication::processEvents();
- qInstallMsgHandler(previousMsgHandler);
+ qInstallMessageHandler(previousMsgHandler);
// QTBUG-15720
QVERIFY(numberOfWarnings == 0);