diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-01-24 11:17:44 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-02-03 18:21:12 +0100 |
| commit | bda38eae465fdf7dc719966e1199eafc7eb7c27c (patch) | |
| tree | dcb541978f1dee98f7762080cef745f523a06a5e /tests/auto/qml/debugger/shared | |
| parent | 32dffb917536c6fb4af2986abaa6b0c7f35daed7 (diff) | |
Tests: rename connect -> connectTo
avoids strange compiler errors if a QObject::connect is used
Change-Id: Ib9f5fc4114a06f7f1d1a0b9a142a15ce19270cec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'tests/auto/qml/debugger/shared')
| -rw-r--r-- | tests/auto/qml/debugger/shared/debugutil.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/shared/debugutil_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp index 68446b53a4..3787f34bc2 100644 --- a/tests/auto/qml/debugger/shared/debugutil.cpp +++ b/tests/auto/qml/debugger/shared/debugutil.cpp @@ -120,7 +120,7 @@ void QQmlDebugTestClient::messageReceived(const QByteArray &ba) emit serverMessage(ba); } -QQmlDebugTest::ConnectResult QQmlDebugTest::connect( +QQmlDebugTest::ConnectResult QQmlDebugTest::connectTo( const QString &executable, const QString &services, const QString &extraArgs, bool block) { diff --git a/tests/auto/qml/debugger/shared/debugutil_p.h b/tests/auto/qml/debugger/shared/debugutil_p.h index 41a5663283..190909dc44 100644 --- a/tests/auto/qml/debugger/shared/debugutil_p.h +++ b/tests/auto/qml/debugger/shared/debugutil_p.h @@ -65,7 +65,7 @@ public: Q_ENUM(ConnectResult) protected: - ConnectResult connect(const QString &executable, const QString &services, + ConnectResult connectTo(const QString &executable, const QString &services, const QString &extraArgs, bool block); virtual QQmlDebugProcess *createProcess(const QString &executable); |