diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-20 15:21:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-20 15:21:31 +0200 |
| commit | fa5b1568e788851fded3ab2e9818725703129fba (patch) | |
| tree | b4c16dd0a1737b5bb3d0c32b89a0ddc3b0a7c744 | |
| parent | a594bd5ddb0926a0854c031307606ac7a143ac77 (diff) | |
| parent | 043ecfb68e1af7a8b0225e59326bf8af344df043 (diff) | |
| download | qtwebsockets-fa5b1568e788851fded3ab2e9818725703129fba.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I7b56e21fa93d0d196887e8dfa683050f3a032186
| -rw-r--r-- | src/websockets/qmaskgenerator.h | 2 | ||||
| -rw-r--r-- | tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 diff --git a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp index 9cef46a..3ac47c4 100644 --- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp +++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp @@ -690,7 +690,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(); |