From c866ba8e3a4489881bf328da16673b8acc1eeca8 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 14 Jul 2015 12:27:40 +0200 Subject: Remove some methods from QQmlDebugServer They were only used internally or for redundant checks in the tests. Change-Id: Iaa7d52be030adaa52a07b28fba53bdef9fada879 Reviewed-by: Simon Hausmann --- tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp | 1 - tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp | 1 - tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp | 3 --- .../qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp | 1 - 4 files changed, 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp index 3aaf833f5b..8062643799 100644 --- a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp +++ b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp @@ -84,7 +84,6 @@ void tst_QQmlDebugClient::initTestCase() QVERIFY(m_conn->isConnected()); - 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 f2cb141a6c..bf0a92b5bb 100644 --- a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp +++ b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp @@ -88,7 +88,6 @@ void tst_QQmlDebugLocal::initTestCase() QVERIFY(m_conn->isConnected()); - 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 da320ebefa..7a46b69b0e 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp +++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp @@ -88,8 +88,6 @@ void tst_QQmlDebugService::initTestCase() QTest::qSleep(100); } QVERIFY(m_conn->isConnected()); - - QTRY_VERIFY(QQmlDebugServer::instance() && QQmlDebugServer::instance()->hasDebuggingClient()); } void tst_QQmlDebugService::checkPortRange() @@ -259,7 +257,6 @@ void tst_QQmlDebugService::checkSupportForOldDataStreamVersion() } QVERIFY(m_conn->isConnected()); - 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 2722ef984b..d2bfd2981b 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp @@ -352,7 +352,6 @@ void tst_QQmlEngineDebugService::initTestCase() bool ok = m_conn->waitForConnected(); QVERIFY(ok); - QTRY_VERIFY(QQmlDebugServer::instance() && QQmlDebugServer::instance()->hasDebuggingClient()); m_dbg = new QQmlEngineDebugClient(m_conn); QTRY_COMPARE(m_dbg->state(), QQmlEngineDebugClient::Enabled); } -- cgit v1.2.3