summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeimage
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/qdeclarativeimage
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/qdeclarativeimage')
-rw-r--r--tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index f05d5390..3668e899 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -686,7 +686,7 @@ void tst_qdeclarativeimage::sourceSize_QTBUG_16389()
}
static int numberOfWarnings = 0;
-static void checkWarnings(QtMsgType, const char *)
+static void checkWarnings(QtMsgType, const QMessageLogContext &, const QString &)
{
numberOfWarnings++;
}
@@ -702,14 +702,14 @@ void tst_qdeclarativeimage::nullPixmapPaint()
QTRY_VERIFY(image != 0);
- QtMsgHandler previousMsgHandler = qInstallMsgHandler(checkWarnings);
+ QtMessageHandler previousMsgHandler = qInstallMessageHandler(checkWarnings);
QPixmap pm(100, 100);
QPainter p(&pm);
// used to print "QTransform::translate with NaN called"
image->paint(&p, 0, 0);
- qInstallMsgHandler(previousMsgHandler);
+ qInstallMessageHandler(previousMsgHandler);
QVERIFY(numberOfWarnings == 0);
delete image;
}