aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml')
-rw-r--r--tests/auto/qml/qmldesigner/coretests/coretests.pro1
-rw-r--r--tests/auto/qml/qmldesigner/testconnectionmanager.cpp14
2 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index c179025da5..e94cddbd7d 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -52,6 +52,7 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyedit
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/debugview
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/edit3d
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/sqlite
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore-lib.pri)
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;
}