diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-13 14:35:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 14:51:47 +0200 |
| commit | 08444bab1bf25e20837ea47b647a5b1216caa05c (patch) | |
| tree | 65fc2e90bbf29f22a92deb322bd4a9de939e8e17 /tests/auto/qml/qqmlinstruction | |
| parent | 75b9cd92dc5291ce12d8d609c5d721246044ffa0 (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/qqmlinstruction')
| -rw-r--r-- | tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp | 8 |
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) { |