diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-10-20 07:38:54 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-10-20 07:35:33 +0000 |
| commit | 05ecdba5d8afac54909d194369c4a1bff76b89ac (patch) | |
| tree | 2a69d437d6fee5910c81746330c08b49930fd236 /tests/auto | |
| parent | ab8cda95a6d4f57ade6adc704b89e284e7daaeea (diff) | |
Tests: Fix compile and code
Change-Id: I2f2a8a4ff9e7bcd3138b93b177e07f2aa3850fcb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qmldesigner/coretests/coretests.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qmldesigner/testconnectionmanager.cpp | 14 |
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; } |