From 79ed2f70f05d30b82c0cec8843f5431cf8224f1c Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Wed, 16 Sep 2015 16:28:24 +0200
Subject: Move QQmlDebugClient into separate static library

Change-Id: Ib3daf9da2cf6798bd022cfcf54d11e565c9cb4ca
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 .../qqmldebugclient/tst_qqmldebugclient.cpp        | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp')

diff --git a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
index abdc2483ea..1bf03dbdee 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
+++ b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
@@ -30,19 +30,20 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qtest.h>
-#include <QSignalSpy>
-#include <QTimer>
-#include <QHostAddress>
-#include <QDebug>
-#include <QThread>
-
-#include <QtQml/qqmlengine.h>
 
 #include "debugutil_p.h"
 #include "qqmldebugtestservice.h"
 
 #include <private/qqmldebugconnector_p.h>
+#include <private/qqmldebugconnection_p.h>
+
+#include <QtTest/qtest.h>
+#include <QtTest/qsignalspy.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qthread.h>
+#include <QtNetwork/qhostaddress.h>
+#include <QtQml/qqmlengine.h>
 
 #define PORT 13770
 #define STR_PORT "13770"
@@ -154,7 +155,9 @@ void tst_QQmlDebugClient::parallelConnect()
     QTest::ignoreMessage(QtWarningMsg, "QML Debugger: Another client is already connected.");
     // will connect & immediately disconnect
     connection2.connectToHost("127.0.0.1", PORT);
-    QTRY_COMPARE(connection2.state(), QAbstractSocket::UnconnectedState);
+    QTest::ignoreMessage(QtWarningMsg, "QQmlDebugConnection: Did not get handshake answer in time");
+    QVERIFY(!connection2.waitForConnected(1000));
+    QVERIFY(!connection2.isConnected());
     QVERIFY(m_conn->isConnected());
 }
 
@@ -165,7 +168,6 @@ void tst_QQmlDebugClient::sequentialConnect()
 
     m_conn->close();
     QVERIFY(!m_conn->isConnected());
-    QCOMPARE(m_conn->state(), QAbstractSocket::UnconnectedState);
 
     // Make sure that the disconnect is actually delivered to the server
     QTest::qWait(100);
-- 
cgit v1.2.3