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/qdeclarativeengine | |
| 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/qdeclarativeengine')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp index cc8dac40..554d0b92 100644 --- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp +++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp @@ -244,9 +244,9 @@ void tst_qdeclarativeengine::clearComponentCache() } static QStringList warnings; -static void msgHandler(QtMsgType, const char *warning) +static void msgHandler(QtMsgType, const QMessageLogContext &, const QString &warning) { - warnings << QString::fromUtf8(warning); + warnings << warning; } void tst_qdeclarativeengine::outputWarningsToStandardError() @@ -261,11 +261,11 @@ void tst_qdeclarativeengine::outputWarningsToStandardError() QVERIFY(c.isReady() == true); warnings.clear(); - QtMsgHandler old = qInstallMsgHandler(msgHandler); + QtMessageHandler old = qInstallMessageHandler(msgHandler); QObject *o = c.create(); - qInstallMsgHandler(old); + qInstallMessageHandler(old); QVERIFY(o != 0); delete o; @@ -279,11 +279,11 @@ void tst_qdeclarativeengine::outputWarningsToStandardError() QCOMPARE(engine.outputWarningsToStandardError(), false); - old = qInstallMsgHandler(msgHandler); + old = qInstallMessageHandler(msgHandler); o = c.create(); - qInstallMsgHandler(old); + qInstallMessageHandler(old); QVERIFY(o != 0); delete o; |