From 9f5945a6309a3026f4ab724d2f16676f505965d8 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 26 Aug 2016 14:17:38 +0200 Subject: QmlTooling: Move QDebugMessageService into own plugin The debug message service is used by both the debugger and the profiler. It shouldn't be necessary to load the debugger plugin in order to do QML profiling. Change-Id: Ic9a4216763098cc795fa9feb98b37ddceeed47d9 Reviewed-by: Simon Hausmann --- .../qmldbg_debugger/qdebugmessageservice.cpp | 105 --------------------- .../qmldbg_debugger/qdebugmessageservice.h | 87 ----------------- .../qmltooling/qmldbg_debugger/qmldbg_debugger.pro | 2 - .../qmldbg_debugger/qqmldebuggerservice.json | 2 +- .../qmldbg_debugger/qqmldebuggerservicefactory.cpp | 4 - .../qmldbg_messages/qdebugmessageservice.cpp | 105 +++++++++++++++++++++ .../qmldbg_messages/qdebugmessageservice.h | 87 +++++++++++++++++ .../qmldbg_messages/qdebugmessageservice.json | 3 + .../qdebugmessageservicefactory.cpp | 54 +++++++++++ .../qmldbg_messages/qdebugmessageservicefactory.h | 57 +++++++++++ .../qmltooling/qmldbg_messages/qmldbg_messages.pro | 21 +++++ src/plugins/qmltooling/qmltooling.pro | 4 +- 12 files changed, 331 insertions(+), 200 deletions(-) delete mode 100644 src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp delete mode 100644 src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h create mode 100644 src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp create mode 100644 src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h create mode 100644 src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.json create mode 100644 src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.cpp create mode 100644 src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.h create mode 100644 src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro (limited to 'src/plugins') diff --git a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp deleted file mode 100644 index b0f59717ac..0000000000 --- a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qdebugmessageservice.h" -#include "qqmldebugpacket.h" -#include - -QT_BEGIN_NAMESPACE - -void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, - const QString &buf) -{ - QQmlDebugConnector::service()->sendDebugMessage(type, ctxt, buf); -} - -QDebugMessageServiceImpl::QDebugMessageServiceImpl(QObject *parent) : - QDebugMessageService(2, parent), oldMsgHandler(0), - prevState(QQmlDebugService::NotConnected) -{ - // don't execute stateChanged() in parallel - QMutexLocker lock(&initMutex); - timer.start(); - if (state() == Enabled) { - oldMsgHandler = qInstallMessageHandler(DebugMessageHandler); - prevState = Enabled; - } -} - -void QDebugMessageServiceImpl::sendDebugMessage(QtMsgType type, - const QMessageLogContext &ctxt, - const QString &buf) -{ - //We do not want to alter the message handling mechanism - //We just eavesdrop and forward the messages to a port - //only if a client is connected to it. - QQmlDebugPacket ws; - ws << QByteArray("MESSAGE") << int(type) << buf.toUtf8(); - ws << QByteArray(ctxt.file) << ctxt.line << QByteArray(ctxt.function); - ws << QByteArray(ctxt.category) << timer.nsecsElapsed(); - - emit messageToClient(name(), ws.data()); - if (oldMsgHandler) - (*oldMsgHandler)(type, ctxt, buf); -} - -void QDebugMessageServiceImpl::stateChanged(State state) -{ - QMutexLocker lock(&initMutex); - - if (state != Enabled && prevState == Enabled) { - QtMessageHandler handler = qInstallMessageHandler(oldMsgHandler); - // has our handler been overwritten in between? - if (handler != DebugMessageHandler) - qInstallMessageHandler(handler); - - } else if (state == Enabled && prevState != Enabled) { - oldMsgHandler = qInstallMessageHandler(DebugMessageHandler); - } - - prevState = state; -} - -void QDebugMessageServiceImpl::synchronizeTime(const QElapsedTimer &otherTimer) -{ - QMutexLocker lock(&initMutex); - timer = otherTimer; -} - -QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h b/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h deleted file mode 100644 index c25e756c2d..0000000000 --- a/src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDEBUGMESSAGESERVICE_H -#define QDEBUGMESSAGESERVICE_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QDebugMessageServicePrivate; - -class QDebugMessageServiceImpl : public QDebugMessageService -{ - Q_OBJECT -public: - QDebugMessageServiceImpl(QObject *parent = 0); - - void sendDebugMessage(QtMsgType type, const QMessageLogContext &ctxt, const QString &buf); - void synchronizeTime(const QElapsedTimer &otherTimer); - -protected: - void stateChanged(State); - -private: - friend class QQmlDebuggerServiceFactory; - - QtMessageHandler oldMsgHandler; - QQmlDebugService::State prevState; - QMutex initMutex; - QElapsedTimer timer; -}; - -QT_END_NAMESPACE - -#endif // QDEBUGMESSAGESERVICE_H diff --git a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro index 27b3a5b513..820b8bbfec 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro +++ b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro @@ -2,7 +2,6 @@ TARGET = qmldbg_debugger QT = qml-private core-private packetprotocol-private SOURCES += \ - $$PWD/qdebugmessageservice.cpp \ $$PWD/qqmldebuggerservicefactory.cpp \ $$PWD/qqmlenginedebugservice.cpp \ $$PWD/qqmlnativedebugservice.cpp \ @@ -16,7 +15,6 @@ SOURCES += \ HEADERS += \ $$PWD/../shared/qqmlconfigurabledebugservice.h \ $$PWD/../shared/qqmldebugpacket.h \ - $$PWD/qdebugmessageservice.h \ $$PWD/qqmldebuggerservicefactory.h \ $$PWD/qqmlenginedebugservice.h \ $$PWD/qqmlnativedebugservice.h \ diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservice.json b/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservice.json index 967a725903..b1152e2a31 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservice.json +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservice.json @@ -1,3 +1,3 @@ { - "Keys": [ "DebugMessages", "QmlDebugger", "V8Debugger", "NativeQmlDebugger" ] + "Keys": [ "QmlDebugger", "V8Debugger", "NativeQmlDebugger" ] } diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp index ca3f07323d..7b1ffb7ccc 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp @@ -39,7 +39,6 @@ #include "qqmldebuggerservicefactory.h" #include "qqmlenginedebugservice.h" -#include "qdebugmessageservice.h" #include "qv4debugservice.h" #include "qqmlnativedebugservice.h" #include @@ -48,9 +47,6 @@ QT_BEGIN_NAMESPACE QQmlDebugService *QQmlDebuggerServiceFactory::create(const QString &key) { - if (key == QDebugMessageServiceImpl::s_key) - return new QDebugMessageServiceImpl(this); - if (key == QQmlEngineDebugServiceImpl::s_key) return new QQmlEngineDebugServiceImpl(this); diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp new file mode 100644 index 0000000000..b0f59717ac --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtQml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qdebugmessageservice.h" +#include "qqmldebugpacket.h" +#include + +QT_BEGIN_NAMESPACE + +void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, + const QString &buf) +{ + QQmlDebugConnector::service()->sendDebugMessage(type, ctxt, buf); +} + +QDebugMessageServiceImpl::QDebugMessageServiceImpl(QObject *parent) : + QDebugMessageService(2, parent), oldMsgHandler(0), + prevState(QQmlDebugService::NotConnected) +{ + // don't execute stateChanged() in parallel + QMutexLocker lock(&initMutex); + timer.start(); + if (state() == Enabled) { + oldMsgHandler = qInstallMessageHandler(DebugMessageHandler); + prevState = Enabled; + } +} + +void QDebugMessageServiceImpl::sendDebugMessage(QtMsgType type, + const QMessageLogContext &ctxt, + const QString &buf) +{ + //We do not want to alter the message handling mechanism + //We just eavesdrop and forward the messages to a port + //only if a client is connected to it. + QQmlDebugPacket ws; + ws << QByteArray("MESSAGE") << int(type) << buf.toUtf8(); + ws << QByteArray(ctxt.file) << ctxt.line << QByteArray(ctxt.function); + ws << QByteArray(ctxt.category) << timer.nsecsElapsed(); + + emit messageToClient(name(), ws.data()); + if (oldMsgHandler) + (*oldMsgHandler)(type, ctxt, buf); +} + +void QDebugMessageServiceImpl::stateChanged(State state) +{ + QMutexLocker lock(&initMutex); + + if (state != Enabled && prevState == Enabled) { + QtMessageHandler handler = qInstallMessageHandler(oldMsgHandler); + // has our handler been overwritten in between? + if (handler != DebugMessageHandler) + qInstallMessageHandler(handler); + + } else if (state == Enabled && prevState != Enabled) { + oldMsgHandler = qInstallMessageHandler(DebugMessageHandler); + } + + prevState = state; +} + +void QDebugMessageServiceImpl::synchronizeTime(const QElapsedTimer &otherTimer) +{ + QMutexLocker lock(&initMutex); + timer = otherTimer; +} + +QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h new file mode 100644 index 0000000000..c25e756c2d --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.h @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtQml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDEBUGMESSAGESERVICE_H +#define QDEBUGMESSAGESERVICE_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QDebugMessageServicePrivate; + +class QDebugMessageServiceImpl : public QDebugMessageService +{ + Q_OBJECT +public: + QDebugMessageServiceImpl(QObject *parent = 0); + + void sendDebugMessage(QtMsgType type, const QMessageLogContext &ctxt, const QString &buf); + void synchronizeTime(const QElapsedTimer &otherTimer); + +protected: + void stateChanged(State); + +private: + friend class QQmlDebuggerServiceFactory; + + QtMessageHandler oldMsgHandler; + QQmlDebugService::State prevState; + QMutex initMutex; + QElapsedTimer timer; +}; + +QT_END_NAMESPACE + +#endif // QDEBUGMESSAGESERVICE_H diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.json b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.json new file mode 100644 index 0000000000..2e8dc65cf5 --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "DebugMessages" ] +} diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.cpp b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.cpp new file mode 100644 index 0000000000..a066237e77 --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.cpp @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtQml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qdebugmessageservicefactory.h" +#include "qdebugmessageservice.h" +#include + +QT_BEGIN_NAMESPACE + +QQmlDebugService *QDebugMessageServiceFactory::create(const QString &key) +{ + if (key == QDebugMessageServiceImpl::s_key) + return new QDebugMessageServiceImpl(this); + + return 0; +} + +QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.h b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.h new file mode 100644 index 0000000000..e09efd1304 --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservicefactory.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtQml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDEBUGMESSAGESERVICEFACTORY_H +#define QDEBUGMESSAGESERVICEFACTORY_H + +#include + +QT_BEGIN_NAMESPACE + +class QDebugMessageServiceFactory : public QQmlDebugServiceFactory +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlDebugServiceFactory_iid FILE "qdebugmessageservice.json") +public: + QQmlDebugService *create(const QString &key); +}; + +QT_END_NAMESPACE + +#endif // QDEBUGMESSAGESERVICEFACTORY_H diff --git a/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro b/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro new file mode 100644 index 0000000000..5ddf7c615d --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro @@ -0,0 +1,21 @@ +TARGET = qmldbg_messages +QT = qml-private core packetprotocol-private + +SOURCES += \ + $$PWD/qdebugmessageservice.cpp \ + $$PWD/qdebugmessageservicefactory.cpp + +HEADERS += \ + $$PWD/../shared/qqmldebugpacket.h \ + $$PWD/qdebugmessageservice.h \ + $$PWD/qdebugmessageservicefactory.h + +INCLUDEPATH += $$PWD \ + $$PWD/../shared + +OTHER_FILES += \ + $$PWD/qdebugmessageservice.json + +PLUGIN_TYPE = qmltooling +PLUGIN_CLASS_NAME = QDebugMessageServiceFactory +load(qt_plugin) diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index 907fbe9273..56996a452f 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -19,12 +19,14 @@ qtConfig(qml-network) { # Services SUBDIRS += \ qmldbg_debugger \ - qmldbg_profiler + qmldbg_profiler \ + qmldbg_messages qmldbg_server.depends = packetprotocol qmldbg_native.depends = packetprotocol qmldbg_debugger.depends = packetprotocol qmldbg_profiler.depends = packetprotocol +qmldbg_messages.depends = packetprotocol qtHaveModule(quick) { SUBDIRS += \ -- cgit v1.2.3