diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-12-15 15:30:41 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-12-22 15:33:20 +0000 |
| commit | 9deb4731a4b6af4c87846b7890e7501f624259d3 (patch) | |
| tree | 047acb51b285f2be6a262376562de49e248f5786 /src/plugins | |
| parent | 7f5b85456b1076993f5d5926914a17bbdf3c14a9 (diff) | |
Make QQmlDebugConnector::hasEngine() const
Change-Id: I7441c24e3c2ae00ac274aa053d2e03d8f61ac830
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp index 58eadbcf7e..fe94610496 100644 --- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp +++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp @@ -255,7 +255,7 @@ void QQmlNativeDebugConnector::removeEngine(QJSEngine *engine) m_engines.removeOne(engine); } -bool QQmlNativeDebugConnector::hasEngine(QJSEngine *engine) +bool QQmlNativeDebugConnector::hasEngine(QJSEngine *engine) const { return m_engines.contains(engine); } diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h index 5b1bc90478..c2eba9dfc4 100644 --- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h +++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h @@ -51,7 +51,7 @@ public: QQmlDebugService *service(const QString &name) const Q_DECL_OVERRIDE; void addEngine(QJSEngine *engine) Q_DECL_OVERRIDE; void removeEngine(QJSEngine *engine) Q_DECL_OVERRIDE; - bool hasEngine(QJSEngine *engine) Q_DECL_OVERRIDE; + bool hasEngine(QJSEngine *engine) const Q_DECL_OVERRIDE; bool addService(const QString &name, QQmlDebugService *service) Q_DECL_OVERRIDE; bool removeService(const QString &name) Q_DECL_OVERRIDE; bool open(const QVariantHash &configuration) Q_DECL_OVERRIDE; diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp index f6e805ca19..a2182c2baf 100644 --- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp +++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp @@ -132,7 +132,7 @@ public: void addEngine(QJSEngine *engine) Q_DECL_OVERRIDE; void removeEngine(QJSEngine *engine) Q_DECL_OVERRIDE; - bool hasEngine(QJSEngine *engine) Q_DECL_OVERRIDE; + bool hasEngine(QJSEngine *engine) const Q_DECL_OVERRIDE; bool addService(const QString &name, QQmlDebugService *service) Q_DECL_OVERRIDE; bool removeService(const QString &name) Q_DECL_OVERRIDE; @@ -183,7 +183,7 @@ private: QHash<QJSEngine *, EngineCondition> m_engineConditions; - QMutex m_helloMutex; + mutable QMutex m_helloMutex; QWaitCondition m_helloCondition; QQmlDebugServerThread m_thread; QPacketProtocol *m_protocol; @@ -597,7 +597,7 @@ void QQmlDebugServerImpl::removeEngine(QJSEngine *engine) m_engineConditions.remove(engine); } -bool QQmlDebugServerImpl::hasEngine(QJSEngine *engine) +bool QQmlDebugServerImpl::hasEngine(QJSEngine *engine) const { QMutexLocker locker(&m_helloMutex); QHash<QJSEngine *, EngineCondition>::ConstIterator i = m_engineConditions.constFind(engine); |