summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-20 15:21:31 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-10-20 15:21:31 +0200
commitfa5b1568e788851fded3ab2e9818725703129fba (patch)
treeb4c16dd0a1737b5bb3d0c32b89a0ddc3b0a7c744 /src
parenta594bd5ddb0926a0854c031307606ac7a143ac77 (diff)
parent043ecfb68e1af7a8b0225e59326bf8af344df043 (diff)
downloadqtwebsockets-fa5b1568e788851fded3ab2e9818725703129fba.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I7b56e21fa93d0d196887e8dfa683050f3a032186
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qmaskgenerator.h2
1 files changed, 1 insertions, 1 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