Merge remote branch 'staging/master' into refactor

Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/glxconvenience/qglxconvenience.cpp
	src/plugins/platforms/platforms.pro
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/plugins/platforms/xcb/qxcbwindowsurface.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 0 insertions, 42 deletions

diff --git a/tests/auto/qtcpsocket/stressTest/Test.h b/tests/auto/qtcpsocket/stressTest/Test.h
index f74eda3c79..1aa4d709c2 100644
--- a/tests/auto/qtcpsocket/stressTest/Test.h
+++ b/tests/auto/qtcpsocket/stressTest/Test.h
@@ -42,49 +42,11 @@
 #define TEST_H
 
 //------------------------------------------------------------------------------
-// Qt
-#ifdef QT3_SUPPORT
-#include <Q3ServerSocket>
-#include <Q3Socket>
-#endif
 
 #include <QTcpServer>
 #include <QTcpSocket>
 
 //------------------------------------------------------------------------------
-#ifdef QT3_SUPPORT
-class My3Socket : public Q3Socket
-{
-    Q_OBJECT
-public:
-    My3Socket(QObject *parent);
-
-    void sendTest(Q_UINT32 num);
-    bool safeShutDown;
-
-private slots:
-    void read();
-    void closed();
-};
-
-//------------------------------------------------------------------------------
-class My3Server : public Q3ServerSocket
-{
-    Q_OBJECT
-public:
-    My3Server(QObject *parent = 0);
-
-    void newConnection(int socket);
-
-private slots:
-    void stopServer();
-
-private:
-    My3Socket *m_socket;
-};
-#endif
-
-//------------------------------------------------------------------------------
 class My4Socket : public QTcpSocket
 {
     Q_OBJECT
@@ -125,10 +87,6 @@ public:
     enum Type {
         Qt4Client,
         Qt4Server,
-#ifdef QT3_SUPPORT
-        Qt3Client,
-        Qt3Server
-#endif
     };
     Test(Type type);
 };