diff options
Diffstat (limited to 'tests/auto/shared/util.cpp')
-rw-r--r-- | tests/auto/shared/util.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp index 57c016a16a..eaefb1f9d6 100644 --- a/tests/auto/shared/util.cpp +++ b/tests/auto/shared/util.cpp @@ -46,6 +46,8 @@ #include <QtQml/QQmlContext> #include <QtQml/QQmlEngine> #include <QtCore/QTextStream> +#include <QtCore/QDebug> +#include <QtCore/QMutexLocker> QQmlDataTest *QQmlDataTest::m_instance = 0; @@ -107,3 +109,30 @@ QByteArray QQmlDataTest::msgComponentError(const QQmlComponent &c, } return result.toLocal8Bit(); } + +Q_GLOBAL_STATIC(QMutex, qQmlTestMessageHandlerMutex) + +QQmlTestMessageHandler *QQmlTestMessageHandler::m_instance = 0; + +void QQmlTestMessageHandler::messageHandler(QtMsgType, const QMessageLogContext &, const QString &message) +{ + QMutexLocker locker(qQmlTestMessageHandlerMutex()); + if (QQmlTestMessageHandler::m_instance) + QQmlTestMessageHandler::m_instance->m_messages.push_back(message); +} + +QQmlTestMessageHandler::QQmlTestMessageHandler() +{ + QMutexLocker locker(qQmlTestMessageHandlerMutex()); + Q_ASSERT(!QQmlTestMessageHandler::m_instance); + QQmlTestMessageHandler::m_instance = this; + m_oldHandler = qInstallMessageHandler(messageHandler); +} + +QQmlTestMessageHandler::~QQmlTestMessageHandler() +{ + QMutexLocker locker(qQmlTestMessageHandlerMutex()); + Q_ASSERT(QQmlTestMessageHandler::m_instance); + qInstallMessageHandler(m_oldHandler); + QQmlTestMessageHandler::m_instance = 0; +} |