diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index 92f98faf..9ece0be9 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -58,9 +58,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_qdeclarativeinstruction::dump() @@ -592,9 +592,9 @@ void tst_qdeclarativeinstruction::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) { |