diff options
author | Erik Verbruggen <erik.verbruggen@me.com> | 2013-10-16 12:29:47 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-10 11:01:35 +0100 |
commit | 0910a577f4d12eea4a099c989bd58f1dee6c88db (patch) | |
tree | 53860b5debf08cef684da1eb387769dbe8ef2d42 /src/qml/debugger/qqmldebugservice.cpp | |
parent | 1738e4ee119bbcd20d33353e7018f04d92766639 (diff) |
Debugging with V4
Currently missing, but coming in subsequent patches:
- evaluating expressions
- evaluating breakpoint conditions
Change-Id: Ib43f2a3aaa252741ea7ce857a274480feb8741aa
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugservice.cpp')
-rw-r--r-- | src/qml/debugger/qqmldebugservice.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp index f036dd9d69..d8fc2f2bb2 100644 --- a/src/qml/debugger/qqmldebugservice.cpp +++ b/src/qml/debugger/qqmldebugservice.cpp @@ -52,20 +52,18 @@ QT_BEGIN_NAMESPACE QQmlDebugServicePrivate::QQmlDebugServicePrivate() - : server(0) { } QQmlDebugService::QQmlDebugService(const QString &name, float version, QObject *parent) : QObject(*(new QQmlDebugServicePrivate), parent) { + QQmlDebugServer::instance(); // create it when it isn't there yet. + Q_D(QQmlDebugService); d->name = name; d->version = version; - d->server = QQmlDebugServer::instance(); d->state = QQmlDebugService::NotConnected; - - } QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, @@ -75,7 +73,6 @@ QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, Q_D(QQmlDebugService); d->name = name; d->version = version; - d->server = QQmlDebugServer::instance(); d->state = QQmlDebugService::NotConnected; } @@ -86,24 +83,23 @@ QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd, QQmlDebugService::State QQmlDebugService::registerService() { Q_D(QQmlDebugService); - if (!d->server) + QQmlDebugServer *server = QQmlDebugServer::instance(); + + if (!server) return NotConnected; - if (d->server->serviceNames().contains(d->name)) { + if (server->serviceNames().contains(d->name)) { qWarning() << "QQmlDebugService: Conflicting plugin name" << d->name; - d->server = 0; } else { - d->server->addService(this); + server->addService(this); } return state(); } QQmlDebugService::~QQmlDebugService() { - Q_D(const QQmlDebugService); - if (d->server) { - d->server->removeService(this); - } + if (QQmlDebugServer *inst = QQmlDebugServer::instance()) + inst->removeService(this); } QString QQmlDebugService::name() const @@ -303,12 +299,11 @@ void QQmlDebugService::sendMessage(const QByteArray &message) void QQmlDebugService::sendMessages(const QList<QByteArray> &messages) { - Q_D(QQmlDebugService); - if (state() != Enabled) return; - d->server->sendMessages(this, messages); + if (QQmlDebugServer *inst = QQmlDebugServer::instance()) + inst->sendMessages(this, messages); } void QQmlDebugService::stateAboutToBeChanged(State) |