aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp')
-rw-r--r--tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
index 77de47dba9..feac36ea34 100644
--- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
+++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
@@ -66,9 +66,9 @@ private slots:
};
static QStringList messages;
-static void msgHandler(QtMsgType, const char *msg)
+static void msgHandler(QtMsgType, const QMessageLogContext &, const QString &msg)
{
- messages << QLatin1String(msg);
+ messages << msg;
}
void tst_qqmlinstruction::dump()
@@ -565,10 +565,10 @@ void tst_qqmlinstruction::dump()
<< "-------------------------------------------------------------------------------";
messages = QStringList();
- QtMsgHandler old = qInstallMsgHandler(msgHandler);
+ QtMessageHandler old = qInstallMessageHandler(msgHandler);
data->dumpInstructions();
- qInstallMsgHandler(old);
+ qInstallMessageHandler(old);
QCOMPARE(messages.count(), expect.count());
for (int ii = 0; ii < messages.count(); ++ii) {