From 92b15c882d651ab5d9bfa84d712c5f520a00b19d Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 6 Apr 2018 12:17:46 +0200 Subject: 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 --- src/qml/debugger/qqmldebugconnector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3