aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlpropertymap
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-13 14:35:42 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-14 14:51:47 +0200
commit08444bab1bf25e20837ea47b647a5b1216caa05c (patch)
tree65fc2e90bbf29f22a92deb322bd4a9de939e8e17 /tests/auto/qml/qqmlpropertymap
parent75b9cd92dc5291ce12d8d609c5d721246044ffa0 (diff)
Autotests: Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5. Change-Id: Icb6423c7d9f7e507ba36376b0af5ad183379c494 Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
Diffstat (limited to 'tests/auto/qml/qqmlpropertymap')
-rw-r--r--tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
index eb3c000c81..a48cee7f93 100644
--- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
+++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
@@ -297,16 +297,16 @@ public slots:
namespace
{
QStringList messages;
- void msgHandler(QtMsgType, const char *msg)
+ void msgHandler(QtMsgType, const QMessageLogContext &, const QString &msg)
{
- messages << QLatin1String(msg);
+ messages << msg;
}
}
void tst_QQmlPropertyMap::metaObjectAccessibility()
{
messages.clear();
- QtMsgHandler old = qInstallMsgHandler(msgHandler);
+ QtMessageHandler old = qInstallMessageHandler(msgHandler);
QQmlEngine engine;
@@ -318,7 +318,7 @@ void tst_QQmlPropertyMap::metaObjectAccessibility()
QCOMPARE(map.metaObject()->className(), "MyEnhancedPropertyMap");
- qInstallMsgHandler(old);
+ qInstallMessageHandler(old);
QCOMPARE(messages.count(), 0);
}