diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-13 16:13:00 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-29 14:35:54 +0000 |
commit | db90054b186317da4e363c64207c0156d9d73da5 (patch) | |
tree | 3c9c7fd5d58ace0bb5e03e7fb67dae8661e08902 /tests | |
parent | 3f3de3b9b762ecc2799a3575b97a2b172fcbc79a (diff) |
Remove static proxy methods from QQmlDebugService
They all internally map to one-liners and just add to binary size and
complexity. Especially, the most used one, isDebuggingEnabled(), simply
checks if there is a QQmlDebugServer::instance().
Change-Id: Ib269928e08506894d933f6696e34ff0d3acb048b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests')
4 files changed, 11 insertions, 5 deletions
diff --git a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp index d2ae863433..3aaf833f5b 100644 --- a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp +++ b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp @@ -39,6 +39,8 @@ #include <QtQml/qqmlengine.h> +#include <private/qqmldebugserver_p.h> + #include "debugutil_p.h" #include "qqmldebugtestservice.h" @@ -82,7 +84,7 @@ void tst_QQmlDebugClient::initTestCase() QVERIFY(m_conn->isConnected()); - QTRY_VERIFY(QQmlDebugService::hasDebuggingClient()); + QTRY_VERIFY(QQmlDebugServer::instance() && QQmlDebugServer::instance()->hasDebuggingClient()); QTRY_COMPARE(client.state(), QQmlDebugClient::Enabled); } diff --git a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp index cef2f1cecd..f2cb141a6c 100644 --- a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp +++ b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp @@ -39,6 +39,8 @@ #include <QThread> #include <ctime> +#include <private/qqmldebugserver_p.h> + #include "debugutil_p.h" #include "qqmldebugtestservice.h" @@ -86,7 +88,7 @@ void tst_QQmlDebugLocal::initTestCase() QVERIFY(m_conn->isConnected()); - QTRY_VERIFY(QQmlDebugService::hasDebuggingClient()); + QTRY_VERIFY(QQmlDebugServer::instance() && QQmlDebugServer::instance()->hasDebuggingClient()); QTRY_COMPARE(client.state(), QQmlDebugClient::Enabled); } diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp index bb8b8f0823..da320ebefa 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp +++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp @@ -39,6 +39,7 @@ #include <QLibraryInfo> #include <QtQml/qqmlengine.h> +#include <private/qqmldebugserver_p.h> #include "../../../shared/util.h" #include "debugutil_p.h" @@ -88,7 +89,7 @@ void tst_QQmlDebugService::initTestCase() } QVERIFY(m_conn->isConnected()); - QTRY_VERIFY(QQmlDebugService::hasDebuggingClient()); + QTRY_VERIFY(QQmlDebugServer::instance() && QQmlDebugServer::instance()->hasDebuggingClient()); } void tst_QQmlDebugService::checkPortRange() @@ -258,7 +259,7 @@ void tst_QQmlDebugService::checkSupportForOldDataStreamVersion() } QVERIFY(m_conn->isConnected()); - QTRY_VERIFY(QQmlDebugService::hasDebuggingClient()); + QTRY_VERIFY(QQmlDebugServer::instance() && QQmlDebugServer::instance()->hasDebuggingClient()); QQmlDebugTestService service("tst_QQmlDebugService::sendMessage2()"); QQmlDebugTestClient client("tst_QQmlDebugService::sendMessage2()", m_conn); diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp index 0b766bc500..2722ef984b 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp @@ -48,6 +48,7 @@ #include <private/qqmlbinding_p.h> #include <private/qqmlboundsignal_p.h> #include <private/qqmldebugservice_p.h> +#include <private/qqmldebugserver_p.h> #include <private/qqmlmetatype_p.h> #include <private/qqmlproperty_p.h> @@ -351,7 +352,7 @@ void tst_QQmlEngineDebugService::initTestCase() bool ok = m_conn->waitForConnected(); QVERIFY(ok); - QTRY_VERIFY(QQmlDebugService::hasDebuggingClient()); + QTRY_VERIFY(QQmlDebugServer::instance() && QQmlDebugServer::instance()->hasDebuggingClient()); m_dbg = new QQmlEngineDebugClient(m_conn); QTRY_COMPARE(m_dbg->state(), QQmlEngineDebugClient::Enabled); } |