Build manual tests.

Add a toplevel manual.pro and other .pro-files to build them and
fix the build.

Change-Id: Ibc98a27b39dd1304edfa8a6894d62e77ce7ef387
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

tests/manual/bearerex/bearerex.cpp

@@ -43,6 +43,7 @@
 #include "datatransferer.h"
 
 #include <QtNetwork>
+#include <QtWidgets>
 
 Q_DECLARE_METATYPE(QNetworkConfiguration)
 
@@ -284,7 +285,7 @@ SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration,
     } else if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) {
         snapLineEdit->setText(apNetworkConfiguration->name()+" ("+apNetworkConfiguration->identifier()+")");
     }
-    bearerLineEdit->setText(apNetworkConfiguration->bearerName());
+    bearerLineEdit->setText(apNetworkConfiguration->bearerTypeName());
     sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
                                  QString(" / ")+
                                  QString::number(m_NetworkSession->bytesReceived()));
@@ -314,8 +315,6 @@ void SessionTab::on_createQNetworkAccessManagerButton_clicked()
         m_dataTransferer = new DataTransfererQNam(this);
     } else if (type == "QTcpSocket") {
         m_dataTransferer = new DataTransfererQTcp(this);
-    } else if (type == "QHttp") {
-        m_dataTransferer = new DataTransfererQHttp(this);
     } else {
         qDebug("BearerEx Warning, unknown data transfer object requested, not creating anything.");
         return;
@@ -512,10 +511,10 @@ void SessionTab::newState(QNetworkSession::State state)
         QNetworkConfiguration config = m_ConfigManager->configurationFromIdentifier(configId);
         if (config.isValid()) {
             iapLineEdit->setText(config.name()+" ("+config.identifier()+")");
-            bearerLineEdit->setText(config.bearerName());
+            bearerLineEdit->setText(config.bearerTypeName());
         }
     } else {
-        bearerLineEdit->setText(m_NetworkSession->configuration().bearerName());
+        bearerLineEdit->setText(m_NetworkSession->configuration().bearerTypeName());
     }
 
     QString active;

tests/manual/bearerex/bearerex.h

@@ -42,7 +42,7 @@
 #ifndef ACCESSPOINTMANAGEREX_H
 #define ACCESSPOINTMANAGEREX_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "ui_detailedinfodialog.h"
 

tests/manual/bearerex/bearerex.pro

@@ -3,6 +3,7 @@ TARGET = BearerEx
 
 QT += core \
       gui \
+      widgets \
       network
 
 FORMS += detailedinfodialog.ui

tests/manual/bearerex/datatransferer.cpp

@@ -134,47 +134,6 @@ void DataTransfererQTcp::error(QAbstractSocket::SocketError socketError)
     emit finished(socketError, 0, "QAbstractSocket::SocketError");
 }
 
-// -------- Based on QHttp
-
-DataTransfererQHttp::DataTransfererQHttp(QObject* parent)
-:   DataTransferer(parent)
-{
-    connect(&m_qhttp, SIGNAL(done(bool)), this, SLOT(done(bool)));
-    qDebug("BearerEx DataTransferer QHttp created.");
-}
-
-DataTransfererQHttp::~DataTransfererQHttp()
-{
-    qDebug("BearerEx DataTransferer QHttp destroyed.");
-}
-
-bool DataTransfererQHttp::transferData()
-{
-    qDebug("BearerEx datatransfer for QHttp requested.");
-    if (m_dataTransferOngoing) {
-        return false;
-    }
-    QString urlstring("http://www.google.com");
-    QUrl url(urlstring);
-    m_qhttp.setHost(url.host(), QHttp::ConnectionModeHttp, url.port() == -1 ? 0 : url.port());
-    m_qhttp.get(urlstring);
-    m_dataTransferOngoing = true;
-    return true;
-}
-
-void DataTransfererQHttp::done(bool /*error*/ )
-{
-    qDebug("BearerEx DatatransfererQHttp reply was finished (error code is type QHttp::Error).");
-    qint64 dataReceived = 0;
-    quint32 errorCode = m_qhttp.error();
-    if (m_qhttp.error() == QHttp::NoError) {
-        QString result(m_qhttp.readAll());
-        dataReceived = result.length();
-    }
-    m_dataTransferOngoing = false;
-    emit finished(errorCode, dataReceived, "QHttp::Error");
-}
-
 // -------- Based on QNetworkAccessManager
 
 DataTransfererQNam::DataTransfererQNam(QObject* parent)

tests/manual/bearerex/datatransferer.h

@@ -47,7 +47,6 @@
 #include <QNetworkReply>
 #include <QNetworkAccessManager>
 #include <QTcpSocket>
-#include <QHttp>
 #include <QDebug>
 
 // Interface-class for data transferring object
@@ -111,20 +110,4 @@ private:
     QNetworkAccessManager m_qnam;
 };
 
-class DataTransfererQHttp : public DataTransferer
-{
-    Q_OBJECT
-public:
-    DataTransfererQHttp(QObject* parent = 0);
-    ~DataTransfererQHttp();
-
-    virtual bool transferData();
-
-public slots:
-    void done(bool error);
-
-private:
-    QHttp m_qhttp;
-};
-
 #endif // DATATRANSFERER_H

tests/manual/cocoa/qt_on_cocoa/window.cpp

@@ -45,7 +45,7 @@
 
 #include <QBackingStore>
 #include <QPainter>
-#include <QtGui>
+#include <QtWidgets>
 
 static int colorIndexId = 0;
 

tests/manual/cocoa/wheelevent/main.cpp

@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 
 #include "window.h"
 

tests/manual/cocoa/wheelevent/window.cpp

@@ -45,7 +45,7 @@
 
 #include <QBackingStore>
 #include <QPainter>
-#include <QtGui>
+#include <QtWidgets>
 
 static int colorIndexId = 0;
 

tests/manual/gestures/gestures.pro

@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+
+SUBDIRS = graphicsview \
+    scrollarea

tests/manual/gestures/graphicsview/graphicsview.pro

@@ -1,3 +1,5 @@
+QT += widgets
+
 SOURCES += main.cpp \
     imageitem.cpp \
     gestures.cpp \

tests/manual/gestures/graphicsview/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "imageitem.h"
 #include "gestures.h"

tests/manual/gestures/scrollarea/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mousepangesturerecognizer.h"
 

tests/manual/gestures/scrollarea/scrollarea.pro

@@ -1,3 +1,5 @@
+QT += widgets
+
 SOURCES = main.cpp \
     mousepangesturerecognizer.cpp
 HEADERS += mousepangesturerecognizer.h

tests/manual/inputmethodhints/inputmethodhints.h

@@ -42,8 +42,8 @@
 #ifndef INPUTMETHODHINTS_H
 #define INPUTMETHODHINTS_H
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
-#include "ui_tst_inputmethodhints.h"
+#include "ui_inputmethodhints.h"
 
 class inputmethodhints : public QMainWindow
 {

tests/manual/inputmethodhints/inputmethodhints.pro

@@ -1,8 +1,7 @@
 TEMPLATE = app
 TARGET = tst_inputmethodhints
 
-QT        += core \
+QT        += widgets
-    gui 
 
 HEADERS   += inputmethodhints.h
 SOURCES   += main.cpp \

tests/manual/inputmethodhints/main.cpp

@@ -41,7 +41,7 @@
 
 #include "inputmethodhints.h"
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QApplication>
 
 int main(int argc, char *argv[])

tests/manual/keypadnavigation/keypadnavigation.pro

@@ -1,2 +1,3 @@
+QT += widgets
 SOURCES += main.cpp
 FORMS += keypadnavigation.ui

tests/manual/keypadnavigation/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "ui_keypadnavigation.h"
 
 class KeypadNavigation : public QMainWindow

tests/manual/lance/interactivewidget.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "interactivewidget.h"
-#include <QtGui/QToolBox>
+#include <QtWidgets>
 
 InteractiveWidget::InteractiveWidget()
 {

tests/manual/lance/interactivewidget.h

@@ -44,7 +44,7 @@
 #include "widgets.h"
 #include "paintcommands.h"
 
-#include <QtGui>
+#include <QMainWindow>
 
 #include <private/qmath_p.h>
 

tests/manual/lance/lance.pro

@@ -1,8 +1,8 @@
-LANCELOT_DIR = $$PWD/../../auto/lancelot
+LANCELOT_DIR = $$PWD/../../auto/other/lancelot
 CONFIG+=console moc
 TEMPLATE = app
 INCLUDEPATH += . $$LANCELOT_DIR
-QT += core-private gui-private
+QT += core-private gui-private widgets printsupport
 
 HEADERS += widgets.h \
            interactivewidget.h \

tests/manual/lance/main.cpp

@@ -43,7 +43,8 @@
 #include "paintcommands.h"
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
+#include <QtPrintSupport>
 #include <qimage.h>
 #include <QPicture>
 
@@ -612,14 +613,11 @@ int main(int argc, char **argv)
                 pcmd.setType(type);
                 pcmd.setCheckersBackground(checkers_background);
                 pcmd.setContents(content);
-                bool ps = type == PsType;
                 QPrinter p(highres ? QPrinter::HighResolution : QPrinter::ScreenResolution);
                 QFileInfo input(files.at(j));
-                QString file = QString("%1_%2.%3")
+                const QString file = input.baseName() + QLatin1Char('_')
-                               .arg(input.baseName())
+                                     + input.suffix() + QStringLiteral(".pdf");
-                               .arg(input.suffix())
+                p.setOutputFormat(QPrinter::PdfFormat);
-                               .arg(ps ? "ps" : "pdf");
-                p.setOutputFormat(ps ? QPrinter::PdfFormat : QPrinter::PostScriptFormat);
                 p.setOutputFileName(file);
                 p.setPageSize(QPrinter::A4);
                 QPainter pt(&p);

tests/manual/lance/widgets.h

@@ -59,9 +59,6 @@
 #include <QSignalMapper>
 #include <QAction>
 
-
-#include <private/qwindowsurface_p.h>
-
 #include <qmath.h>
 
 const int CP_RADIUS = 10;
@@ -236,12 +233,7 @@ public:
         }
 
         if (m_render_view.isNull()) {
-
-            if (T::window()->windowSurface())
-                m_render_view = T::window()->windowSurface()->grabWidget(this);
-            else
             m_render_view = QPixmap::grabWidget(this);
-
             m_render_view.save("renderView.png");
         }
     }

tests/manual/manual.pro

@@ -0,0 +1,32 @@
+TEMPLATE=subdirs
+
+SUBDIRS = bearerex \
+gestures \
+inputmethodhints \
+keypadnavigation \
+lance \
+network_remote_stresstest \
+network_stresstest \
+qcursor \
+qdesktopwidget \
+qgraphicsitemgroup \
+qgraphicslayout/flicker \
+qhttpnetworkconnection \
+qimagereader \
+qlocale \
+qnetworkaccessmanager/qget \
+qnetworkconfigurationmanager \
+qnetworkreply \
+qssloptions \
+qtabletevent \
+qtbug-8933 \
+qtouchevent \
+qwidget_zorder \
+repaint \
+socketengine \
+textrendering \
+widgets/itemviews/delegate \
+windowflags \
+windowmodality
+
+!contains(QT_CONFIG, openssl):!contains(QT_CONFIG, openssl-linked):SUBDIRS -= qssloptions

tests/manual/network_remote_stresstest/network_remote_stresstest.pro

@@ -1,9 +1,10 @@
 CONFIG += testcase
 TARGET = tst_network_remote_stresstest
 
-QT = core network testlib
+QT = core core-private network network-private testlib
 
 SOURCES  += tst_network_remote_stresstest.cpp
 
 RESOURCES += url-list.qrc
 
+LIBS += $$QMAKE_LIBS_NETWORK

tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp

@@ -235,6 +235,10 @@ void tst_NetworkRemoteStressTest::blockingSequentialRemoteHosts()
     QElapsedTimer outerTimer;
     outerTimer.start();
 
+#ifdef QT_NO_SSL
+    QVERIFY(!useSslSocket);
+#endif // QT_NO_SSL
+
     for (int i = 0; i < urlList.size(); ++i) {
         const QUrl &url = urlList.at(i);
         bool isHttps = url.scheme() == "https";
@@ -243,21 +247,24 @@ void tst_NetworkRemoteStressTest::blockingSequentialRemoteHosts()
         timeout.start();
 
         QSharedPointer<QTcpSocket> socket;
-        if (useSslSocket || isHttps) {
+#ifndef QT_NO_SSL
+        if (useSslSocket || isHttps)
             socket = QSharedPointer<QTcpSocket>(new QSslSocket);
-        } else {
+#endif // QT_NO_SSL
+        if (socket.isNull())
             socket = QSharedPointer<QTcpSocket>(new QTcpSocket);
-        }
 
         socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80));
         QVERIFY2(socket->waitForConnected(10000), "Timeout connecting to " + url.encodedHost());
 
+#ifndef QT_NO_SSL
         if (isHttps) {
             static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0);
             static_cast<QSslSocket *>(socket.data())->startClientEncryption();
             static_cast<QSslSocket *>(socket.data())->ignoreSslErrors();
             QVERIFY2(static_cast<QSslSocket *>(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + url.encodedHost());
         }
+#endif // QT_NO_SSL
 
         socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n"
                       "Connection: close\r\n"
@@ -288,6 +295,10 @@ void tst_NetworkRemoteStressTest::sequentialRemoteHosts()
     QFETCH_GLOBAL(QVector<QUrl>, urlList);
     QFETCH_GLOBAL(bool, useSslSocket);
 
+#ifdef QT_NO_SSL
+    QVERIFY(!useSslSocket);
+#endif // QT_NO_SSL
+
     qint64 totalBytes = 0;
     QElapsedTimer outerTimer;
     outerTimer.start();
@@ -300,15 +311,18 @@ void tst_NetworkRemoteStressTest::sequentialRemoteHosts()
         timeout.start();
 
         QSharedPointer<QTcpSocket> socket;
-        if (useSslSocket || isHttps) {
+#ifndef QT_NO_SSL
+        if (useSslSocket || isHttps)
             socket = QSharedPointer<QTcpSocket>(new QSslSocket);
-        } else {
+#endif // QT_NO_SSL
+        if (socket.isNull())
             socket = QSharedPointer<QTcpSocket>(new QTcpSocket);
-        }
         if (isHttps) {
+#ifndef QT_NO_SSL
             static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0);
             static_cast<QSslSocket *>(socket.data())->connectToHostEncrypted(url.host(), url.port(443));
             static_cast<QSslSocket *>(socket.data())->ignoreSslErrors();
+#endif // QT_NO_SSL
         } else {
             socket->connectToHost(url.host(), url.port(80));
         }
@@ -356,6 +370,10 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts()
 
     QFETCH(int, parallelAttempts);
 
+#ifdef QT_NO_SSL
+    QVERIFY(!useSslSocket);
+#endif // QT_NO_SSL
+
     qint64 totalBytes = 0;
     QElapsedTimer outerTimer;
     outerTimer.start();
@@ -371,15 +389,19 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts()
         for (int j = 0; j < parallelAttempts && it != urlList.constEnd(); ++j, ++it) {
             const QUrl &url = *it;
             bool isHttps = url.scheme() == "https";
-            QTcpSocket *socket;
+            QTcpSocket *socket = 0;
+#ifndef QT_NO_SSL
             if (useSslSocket || isHttps)
                 socket = new QSslSocket;
-            else
+#endif // QT_NO_SSL
+            if (!socket)
                 socket = new QTcpSocket;
             if (isHttps) {
+#ifndef QT_NO_SSL
                 static_cast<QSslSocket *>(socket)->setProtocol(QSsl::TlsV1_0);
                 static_cast<QSslSocket *>(socket)->connectToHostEncrypted(url.host(), url.port(443));
                 static_cast<QSslSocket *>(socket)->ignoreSslErrors();
+#endif // QT_NO_SSL
             } else {
                 socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80));
             }

tests/manual/network_stresstest/network_stresstest.pro

@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_network_stresstest
 
-QT = core network testlib
+QT = core-private network-private testlib
 
 SOURCES  += tst_network_stresstest.cpp \
     minihttpserver.cpp
@@ -11,3 +11,4 @@ HEADERS += \
 
 RESOURCES += wwwfiles.qrc
 QMAKE_RESOURCE_FLAGS += -no-compress
+LIBS += $$QMAKE_LIBS_NETWORK

tests/manual/network_stresstest/tst_network_stresstest.cpp

@@ -338,13 +338,13 @@ void tst_NetworkStressTest::nativeNonBlockingConnectDisconnect()
             QVERIFY(fd != INVALID_SOCKET);
 
             // set the socket to non-blocking and start connecting
-            unsigned long buf = v;
+            unsigned long buf = 0;
             unsigned long outBuf;
             DWORD sizeWritten = 0;
             QVERIFY(::WSAIoctl(fd, FIONBIO, &buf, sizeof(unsigned long), &outBuf, sizeof(unsigned long), &sizeWritten, 0,0) != SOCKET_ERROR);
 
             while (true) {
-                int connectResult = ::WSAConnect(fd, sockAddrPtr, sockAddrSize, 0,0,0,0);
+                int connectResult = ::WSAConnect(fd, (sockaddr *)addr.data(), addr.size(), 0,0,0,0);
                 if (connectResult == 0 || WSAGetLastError() == WSAEISCONN) {
                     break; // connected
                 } else {

tests/manual/qdesktopwidget/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 class DesktopView : public QGraphicsView
 {

tests/manual/qdesktopwidget/qdesktopwidget.pro

@@ -1,2 +1,3 @@
 TEMPLATE = app
+QT += widgets
 SOURCES += main.cpp

tests/manual/qgraphicsitemgroup/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "widget.h"
 
 int main(int argc, char *argv[])

tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro

@@ -1,4 +1,5 @@
 TARGET = qgraphicsitemgroup
+QT += widgets
 TEMPLATE = app
 SOURCES += main.cpp \
     widget.cpp \

tests/manual/qgraphicslayout/flicker/flicker.pro

@@ -1,2 +1,3 @@
+QT += widgets
 HEADERS += window.h
 SOURCES += main.cpp window.cpp

tests/manual/qgraphicslayout/flicker/main.cpp

@@ -39,8 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
-#include <windows.h>
 #include "window.h"
 
 int main(int argc, char **argv)

tests/manual/qgraphicslayout/flicker/window.h

@@ -43,7 +43,7 @@
 #define WINDOW_H
 
 
-#include <QtGui>
+#include <QtWidgets>
 
 struct Statistics {
     Statistics() : output(0),

tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro

@@ -5,6 +5,4 @@ TARGET = tst_qhttpnetworkconnection
 QT -= gui
 QT += network testlib
 
-CONFIG += release
-
 SOURCES += main.cpp

tests/manual/qimagereader/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 class MyWidget : public QWidget
 {

tests/manual/qimagereader/qimagereader.pro

@@ -1 +1,2 @@
+QT += widgets
 SOURCES += main.cpp

tests/manual/qlocale/calendar.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "calendar.h"
 

tests/manual/qlocale/calendar.h

@@ -41,7 +41,7 @@
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class CalendarWidget : public QWidget
 {

tests/manual/qlocale/currency.h

@@ -41,7 +41,7 @@
 #ifndef CURRENCY_H
 #define CURRENCY_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class CurrencyWidget : public QWidget
 {

tests/manual/qlocale/dateformats.h

@@ -41,7 +41,7 @@
 #ifndef DATEFORMATS_H
 #define DATEFORMATS_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class DateFormatsWidget : public QWidget
 {

tests/manual/qlocale/info.h

@@ -41,7 +41,7 @@
 #ifndef INFO_H
 #define INFO_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class InfoWidget : public QWidget
 {

tests/manual/qlocale/languages.h

@@ -41,7 +41,7 @@
 #ifndef LANGUAGES_H
 #define LANGUAGES_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class LanguagesWidget : public QWidget
 {

tests/manual/qlocale/main.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "window.h"
 

tests/manual/qlocale/miscellaneous.h

@@ -41,7 +41,7 @@
 #ifndef MISCELLANEOUS_H
 #define MISCELLANEOUS_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class MiscWidget : public QWidget
 {

tests/manual/qlocale/numberformats.h

@@ -41,7 +41,7 @@
 #ifndef NUMBERFORMATS_H
 #define NUMBERFORMATS_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 class NumberFormatsWidget : public QWidget
 {

tests/manual/qlocale/qlocale.pro

@@ -1,2 +1,3 @@
+QT += widgets
 HEADERS += currency.h calendar.h dateformats.h numberformats.h languages.h window.h miscellaneous.h info.h
 SOURCES += currency.cpp main.cpp calendar.cpp dateformats.cpp numberformats.cpp languages.cpp window.cpp miscellaneous.cpp info.cpp

tests/manual/qlocale/window.h

@@ -41,7 +41,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "calendar.h"
 #include "currency.h"

tests/manual/qnetworkaccessmanager/qget/qget.h

@@ -113,7 +113,9 @@ private slots:
     void finished(QNetworkReply *reply);
     void authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator);
     void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);
+#ifndef QT_NO_SSL
     void sslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
+#endif
     void downloadFinished(TransferItem *item);
 private:
     TransferItem *findTransfer(QNetworkReply *reply);

tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro

@@ -5,6 +5,4 @@ TARGET = tst_qnetworkconfigurationmanager
 QT -= gui
 QT += network testlib
 
-CONFIG += release
-
 SOURCES += main.cpp

tests/manual/qnetworkreply/qnetworkreply.pro

@@ -5,6 +5,4 @@ TARGET = tst_qnetworkreply
 QT -= gui
 QT += network testlib
 
-CONFIG += release
-
 SOURCES += main.cpp

tests/manual/qtabletevent/device_information/device_information.pro

@@ -1,3 +1,4 @@
+QT += widgets
 SOURCES += \
     main.cpp \
     tabletwidget.cpp

tests/manual/qtabletevent/device_information/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QApplication>
 #include "tabletwidget.h"
 
 int main(int argc, char **argv) {

tests/manual/qtabletevent/event_compression/event_compression.pro

@@ -1,4 +1,4 @@
-QT += testlib
+QT += widgets testlib
 
 SOURCES += main.cpp \
     mousestatwidget.cpp

tests/manual/qtabletevent/qtabletevent.pro

@@ -0,0 +1,5 @@
+TEMPLATE=subdirs
+
+SUBDIRS = device_information \
+    event_compression \
+    regular_widgets

tests/manual/qtabletevent/regular_widgets/regular_widgets.pro

@@ -1,3 +1,4 @@
 TEMPLATE = app
+QT += widgets
 
 SOURCES += main.cpp

tests/manual/qtbug-8933/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "widget.h"
 
 int main(int argc, char *argv[])

tests/manual/qtbug-8933/qtbug-8933.pro

@@ -6,7 +6,7 @@
 
 TARGET = qtbug-8933
 TEMPLATE = app
-
+QT += widgets
 
 SOURCES += main.cpp\
         widget.cpp

tests/manual/qtouchevent/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtTest>
 
 #include "ui_form.h"

tests/manual/qtouchevent/qtouchevent.pro

@@ -1,4 +1,4 @@
-QT += testlib
+QT += widgets testlib
 SOURCES = main.cpp \
     touchwidget.cpp
 FORMS += form.ui

tests/manual/qwidget_zorder/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 class Widget : public QWidget
 {

tests/manual/qwidget_zorder/qwidget_zorder.pro

@@ -1 +1,2 @@
+QT += widgets
 SOURCES += main.cpp

tests/manual/repaint/mainwindow/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "../shared/shared.h"
 
 int main(int argc, char **argv)

tests/manual/repaint/mainwindow/mainwindow.pro

@@ -1,2 +1,3 @@
+QT += widgets
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp

tests/manual/repaint/repaint.pro

@@ -0,0 +1,9 @@
+TEMPLATE=subdirs
+
+SUBDIRS = mainwindow \
+    scrollarea \
+    splitter \
+    tableview \
+    task141091 \
+    toplevel \
+    widget

tests/manual/repaint/scrollarea/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "../shared/shared.h"
 
 

tests/manual/repaint/scrollarea/scrollarea.pro

@@ -1,2 +1,3 @@
+QT += widgets
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp

tests/manual/repaint/shared/shared.h

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 class StaticWidget : public QWidget
 {
 Q_OBJECT

tests/manual/repaint/splitter/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "../shared/shared.h"
 
 int main(int argc, char **argv)

tests/manual/repaint/splitter/splitter.pro

@@ -1,2 +1,3 @@
+QT += widgets
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp

tests/manual/repaint/tableview/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "../shared/shared.h"
 
 class CellWidget : public QWidget

tests/manual/repaint/tableview/tableview.pro

@@ -1,2 +1,3 @@
+QT += widgets
 HEADERS +=../shared/shared.h
 SOURCES += main.cpp

tests/manual/repaint/task141091/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QDebug>
 
 class MyWidget : public QWidget

tests/manual/repaint/task141091/task141091.pro

@@ -1,3 +1,3 @@
 CONFIG += console
-
+QT += widgets
 SOURCES += main.cpp

tests/manual/repaint/toplevel/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "../shared/shared.h"
 
 int main(int argc, char **argv)

tests/manual/repaint/toplevel/toplevel.pro

@@ -1,4 +1,5 @@
 CONFIG += console
+QT += widgets
 
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp

tests/manual/repaint/widget/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "../shared/shared.h"
 
 class Child : public StaticWidget

tests/manual/repaint/widget/widget.pro

@@ -1,2 +1,3 @@
+QT += widgets
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp

tests/manual/socketengine/main.cpp

@@ -49,7 +49,6 @@
 #include <QDebug>
 #include <private/qabstractsocketengine_p.h>
 #include <cstdio>
-#include <strings.h>
 #include <QNetworkConfigurationManager>
 #include <QNetworkConfiguration>
 #include <QNetworkSession>
@@ -97,7 +96,7 @@ int main(int argc, char**argv)
                     // disconnected
                     exit(0);
                 }
-                bzero(buf, bufsize);
+                qFill(buf, buf + bufsize, 0);
                 ret = socketEngine->read(buf, available);
                 if (ret > 0) {
                     printf("%s", buf);

tests/manual/socketengine/socketengine.pro

@@ -3,8 +3,6 @@ TEMPLATE = app
 TARGET = tst_socketengine
 
 QT -= gui
-QT += network testlib
+QT += network-private core-private testlib
-
-CONFIG += release
 
 SOURCES += main.cpp

tests/manual/textrendering/glyphshaping/glyphshaping.pro

@@ -1,3 +1,4 @@
+QT += widgets
 SOURCES = main.cpp
 OTHER_FILES = glyphshaping_data.xml
 glyphshaping_data.path = .

tests/manual/textrendering/glyphshaping/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 static const int fontPixelSize = 25;
 static const QLatin1String fontFamily("Series 60 Sans");

tests/manual/textrendering/textperformance/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 static const int lastMeasurementsCount = 50;
 

tests/manual/textrendering/textperformance/textperformance.pro

@@ -1 +1,2 @@
+QT += widgets
 SOURCES = main.cpp

tests/manual/textrendering/textrendering.pro

@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+
+SUBDIRS = glyphshaping \
+    textperformance

tests/manual/widgets/itemviews/delegate/delegate.pro

@@ -1,2 +1,3 @@
 TEMPLATE = app
+QT += widgets
 SOURCES=example.cpp

tests/manual/windowflags/controllerwindow.cpp

@@ -39,7 +39,14 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QHBoxLayout>
 
 #include "controllerwindow.h"
 
@@ -72,7 +79,8 @@ ControllerWindow::ControllerWindow()
     mainLayout->addLayout(bottomLayout);
     setLayout(mainLayout);
 
-    setWindowTitle(tr("Window Flags"));
+    setWindowTitle(tr("Window Flags (Qt version %1, %2)")
+                   .arg(QLatin1String(qVersion()), qApp->platformName()));
     updatePreview();
 }
 

tests/manual/windowflags/previewwindow.cpp

@@ -39,7 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
 
 #include "previewwindow.h"
 

tests/manual/windowflags/windowflags.pro

@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = controllerwindow.h \
                 previewwindow.h
 SOURCES       = controllerwindow.cpp \