From cc3a57861d5ef6e84cef0adfa1aaf726dd2b9d84 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 13 Jul 2015 15:56:25 +0200 Subject: Use signal/slot for passing messages through QQmlDebugServer This results in much cleaner code than the previous implementation using QMetaObject::invokeMethod(). We have to use read locks now for adding and removing engines, as we should have done already before. If a condition is waiting on a write lock you cannot acquire a read lock from another thread. So, if we kept the write locks we wouldn't be able to receive messages while the engines are waiting. Change-Id: Icfe641601dec2f8d7181ae579146ed603d57a4c2 Reviewed-by: Simon Hausmann --- src/qml/debugger/qqmlinspectorservice.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/qml/debugger/qqmlinspectorservice.cpp') diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp index e3c7ad7d55..c6ee8e4d52 100644 --- a/src/qml/debugger/qqmlinspectorservice.cpp +++ b/src/qml/debugger/qqmlinspectorservice.cpp @@ -73,14 +73,6 @@ void QQmlInspectorService::removeView(QObject *view) updateState(); } -void QQmlInspectorService::sendMessage(const QByteArray &message) -{ - if (state() != Enabled) - return; - - QQmlDebugService::sendMessage(message); -} - void QQmlInspectorService::stateChanged(State /*state*/) { QMetaObject::invokeMethod(this, "updateState", Qt::QueuedConnection); -- cgit v1.2.3