Merge remote-tracking branch 'origin/4.14' into master

Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/qml/qmldesigner/testconnectionmanager.cpp b/tests/auto/qml/qmldesigner/testconnectionmanager.cpp
index f637fb1f1a..03a6d43346 100644
--- a/tests/auto/qml/qmldesigner/testconnectionmanager.cpp
+++ b/tests/auto/qml/qmldesigner/testconnectionmanager.cpp
@@ -32,26 +32,26 @@ namespace QmlDesigner {
 
 TestConnectionManager::TestConnectionManager()
 {
-    m_connections.emplace_back("Editor", "editormode");
+    connections().emplace_back("Editor", "editormode");
 }
 
 void TestConnectionManager::writeCommand(const QVariant &command)
 {
-    TestConnectionManager::writeCommand(command);
+    ConnectionManager::writeCommand(command);
 
-    m_writeCommandCounter++;
+    writeCommandCounter()++;
 
     static int synchronizeId = 0;
     synchronizeId++;
     SynchronizeCommand synchronizeCommand(synchronizeId);
 
-    QLocalSocket *socket = m_connections.front().socket.get();
+    QLocalSocket *socket = connections().front().socket.get();
 
-    writeCommandToIODevice(QVariant::fromValue(synchronizeCommand), socket, m_writeCommandCounter);
-    m_writeCommandCounter++;
+    writeCommandToIODevice(QVariant::fromValue(synchronizeCommand), socket, writeCommandCounter());
+    writeCommandCounter()++;
 
     while (socket->waitForReadyRead(100)) {
-        readDataStream(m_connections.front());
+        readDataStream(connections().front());
         if (m_synchronizeId == synchronizeId)
             return;
     }