diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-13 14:47:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 14:51:39 +0200 |
| commit | aa6d27f043f0367ea4c16bb255f65b2a6abb5921 (patch) | |
| tree | 663c468830121f3cd3abc8a85a9cae3a2b7a8311 /tests/auto/declarative/qdeclarativeinstruction | |
| parent | cf5b6c3ef72df623117678de01fd5557861ba73b (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/qdeclarativeinstruction')
| -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) { |