From 08582917b43af8670658c210b2cb2a8b06e04252 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@theqtcompany.com>
Date: Mon, 12 Oct 2015 13:54:13 +0200
Subject: Include QtCore/ in path for #include of QObject.

Task-number: QTBUG-48714
Change-Id: I0e9b54b98b561f3d82f542ac5d311ca1aca252eb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/websockets/qmaskgenerator.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h
index a155340..4a13b1d 100644
--- a/src/websockets/qmaskgenerator.h
+++ b/src/websockets/qmaskgenerator.h
@@ -34,7 +34,7 @@
 #ifndef QMASKGENERATOR_H
 #define QMASKGENERATOR_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "QtWebSockets/qwebsockets_global.h"
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.1


From 043ecfb68e1af7a8b0225e59326bf8af344df043 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Mon, 19 Oct 2015 10:48:19 +0200
Subject: Test: stablize tst_QWebSocket::tst_moveToThread()

For e8335d48, the test is flaky, but old CI treated it as a PASS.

Task-number: QTBUG-48843
Change-Id: I4d2c0d270824d7b1e954e9174493fba2c1c5433f
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
---
 tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
index cc3bca6..80bf19a 100644
--- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
+++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
@@ -668,7 +668,7 @@ void tst_QWebSocket::tst_moveToThread()
 
     socket->asyncClose();
 
-    QCOMPARE(timer.isActive(), false);
+    QTRY_COMPARE_WITH_TIMEOUT(loop.isRunning(), false, 200);
     QCOMPARE(socket->receivedMessage, textMessage);
 
     socket->deleteLater();
-- 
cgit v1.2.1