diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-04-06 12:17:46 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-22 08:17:18 +0000 |
| commit | 92b15c882d651ab5d9bfa84d712c5f520a00b19d (patch) | |
| tree | be464f88ca264c826f20177449dd2787bfae499c /src/qml/debugger | |
| parent | 3442f6c7679ecd30f035ca0708a2b47091ea47f4 (diff) | |
QQmlDebugConnector: Don't complain about new pluginKey if it's unchanged
We cannot set the plugin key to a new value if we've already instantiated
the plugin. Setting the same value again, is a noop, though.
Change-Id: Ib2d2cb3dc20d8d3d7f1673957970f5235e3aeccc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmldebugconnector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp index d9f51ce09f..0ef40d6911 100644 --- a/src/qml/debugger/qqmldebugconnector.cpp +++ b/src/qml/debugger/qqmldebugconnector.cpp @@ -82,7 +82,7 @@ Q_GLOBAL_STATIC(QQmlDebugConnectorParams, qmlDebugConnectorParams) void QQmlDebugConnector::setPluginKey(const QString &key) { QQmlDebugConnectorParams *params = qmlDebugConnectorParams(); - if (params) { + if (params && params->pluginKey != key) { if (params->instance) qWarning() << "QML debugger: Cannot set plugin key after loading the plugin."; else |