qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ulf Hermann 2018-04-06 12:17:46 +02:00
parent 3442f6c767
commit 92b15c882d
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/debugger/qqmldebugconnector.cpp
View File

@ -82,7 +82,7 @@ Q_GLOBAL_STATIC(QQmlDebugConnectorParams, qmlDebugConnectorParams)
void QQmlDebugConnector::setPluginKey(const QString &key) void QQmlDebugConnector::setPluginKey(const QString &key)
{ {
QQmlDebugConnectorParams *params = qmlDebugConnectorParams(); QQmlDebugConnectorParams *params = qmlDebugConnectorParams();
if (params) { if (params && params->pluginKey != key) {
if (params->instance) if (params->instance)
qWarning() << "QML debugger: Cannot set plugin key after loading the plugin."; qWarning() << "QML debugger: Cannot set plugin key after loading the plugin.";
else else

2
tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
View File

@ -66,8 +66,6 @@ void tst_QQmlDebugClient::initTestCase()
QQmlDebugConnector::setPluginKey(QLatin1String("QQmlDebugServer")); QQmlDebugConnector::setPluginKey(QLatin1String("QQmlDebugServer"));
QQmlDebugConnector::setServices(QStringList() QQmlDebugConnector::setServices(QStringList()
<< QStringLiteral("tst_QQmlDebugClient::handshake()")); << QStringLiteral("tst_QQmlDebugClient::handshake()"));
QTest::ignoreMessage(QtWarningMsg,
"QML debugger: Cannot set plugin key after loading the plugin.");
m_service = new QQmlDebugTestService("tst_QQmlDebugClient::handshake()"); m_service = new QQmlDebugTestService("tst_QQmlDebugClient::handshake()");

2
tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp
View File

@ -65,8 +65,6 @@ void tst_QQmlDebugLocal::initTestCase()
{ {
fileName = QString::fromLatin1("tst_QQmlDebugLocal%1").arg(std::time(nullptr)); fileName = QString::fromLatin1("tst_QQmlDebugLocal%1").arg(std::time(nullptr));
QQmlDebugConnector::setPluginKey("QQmlDebugServer"); QQmlDebugConnector::setPluginKey("QQmlDebugServer");
QTest::ignoreMessage(QtWarningMsg,
"QML debugger: Cannot set plugin key after loading the plugin.");
m_service = new QQmlDebugTestService("tst_QQmlDebugLocal::handshake()"); m_service = new QQmlDebugTestService("tst_QQmlDebugLocal::handshake()");
const QString waitingMsg = QString("QML Debugger: Connecting to socket %1...").arg(fileName); const QString waitingMsg = QString("QML Debugger: Connecting to socket %1...").arg(fileName);

2
tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
View File

@ -75,8 +75,6 @@ void tst_QQmlDebugService::initTestCase()
QQmlDebugConnector::setPluginKey(QLatin1String("QQmlDebugServer")); QQmlDebugConnector::setPluginKey(QLatin1String("QQmlDebugServer"));
QQmlDebugConnector::setServices(QStringList() QQmlDebugConnector::setServices(QStringList()
<< QStringLiteral("tst_QQmlDebugService")); << QStringLiteral("tst_QQmlDebugService"));
QTest::ignoreMessage(QtWarningMsg,
"QML debugger: Cannot set plugin key after loading the plugin.");
m_service = new QQmlDebugTestService("tst_QQmlDebugService", 2); m_service = new QQmlDebugTestService("tst_QQmlDebugService", 2);
foreach (const QString &service, QQmlDebuggingEnabler::debuggerServices()) foreach (const QString &service, QQmlDebuggingEnabler::debuggerServices())