summaryrefslogtreecommitdiff
path: root/tests/auto/qgeocoordinate
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-13 14:59:46 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-14 12:06:25 +0200
commit87f7acdc3ca2665c620e5ce79fa45e5e68913cb2 (patch)
treea377898f3323b679df62156be4f56e991f9d37c0 /tests/auto/qgeocoordinate
parent29fcc001772e79c06fae9f964ec18a0cf9157a39 (diff)
downloadqtlocation-87f7acdc3ca2665c620e5ce79fa45e5e68913cb2.tar.gz
Tests: Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5. Change-Id: Ib7d25adecfba73e43661106aeefd823ad1e82e2d Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'tests/auto/qgeocoordinate')
-rw-r--r--tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
index f5e4e2ea..5e73867d 100644
--- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
+++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
@@ -68,11 +68,11 @@ static const QChar DEGREES_SYMB(0x00B0);
QByteArray tst_qgeocoordinate_debug;
-void tst_qgeocoordinate_messageHandler(QtMsgType type, const char *msg)
+void tst_qgeocoordinate_messageHandler(QtMsgType type, const QMessageLogContext &, const QString &msg)
{
switch (type) {
case QtDebugMsg :
- tst_qgeocoordinate_debug = QByteArray(msg);
+ tst_qgeocoordinate_debug = msg.toLocal8Bit();
break;
default:
break;
@@ -855,9 +855,9 @@ private slots:
QFETCH(QGeoCoordinate, c);
QFETCH(QByteArray, debugString);
- qInstallMsgHandler(tst_qgeocoordinate_messageHandler);
+ qInstallMessageHandler(tst_qgeocoordinate_messageHandler);
qDebug() << c;
- qInstallMsgHandler(0);
+ qInstallMessageHandler(0);
QCOMPARE(tst_qgeocoordinate_debug, debugString);
}