Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Ica3f89ace33585ad7854417a328156f5a68e2a00

6 files changed, 32 insertions, 3 deletions

diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp
index 80e269ee2a..c9f9cd9bd2 100644
--- a/tests/baselineserver/shared/baselineprotocol.cpp
+++ b/tests/baselineserver/shared/baselineprotocol.cpp
@@ -366,7 +366,7 @@ bool BaselineProtocol::connect(const QString &testCase, bool *dryrun, const Plat
     if (!socket.waitForConnected(Timeout)) {
         sysSleep(3000);  // Wait a bit and try again, the server might just be restarting
         if (!socket.waitForConnected(Timeout)) {
-            errMsg += QLS("TCP connectToHost failed. Host:") + serverName + QLS(" port:") + QString::number(ServerPort);
+            errMsg += QLS("TCP connectToHost failed. Host:") + QLS(serverName) + QLS(" port:") + QString::number(ServerPort);
             return false;
         }
     }
diff --git a/tests/manual/gestures/graphicsview/gestures.cpp b/tests/manual/gestures/graphicsview/gestures.cpp
index cc0ff3e1aa..6e5b07bf18 100644
--- a/tests/manual/gestures/graphicsview/gestures.cpp
+++ b/tests/manual/gestures/graphicsview/gestures.cpp
@@ -44,11 +44,13 @@ QGestureRecognizer::Result ThreeFingerSlideGestureRecognizer::recognize(QGesture
     switch (event->type()) {
     case QEvent::TouchBegin:
         result = QGestureRecognizer::MayBeGesture;
+        break;
     case QEvent::TouchEnd:
         if (d->gestureFired)
             result = QGestureRecognizer::FinishGesture;
         else
             result = QGestureRecognizer::CancelGesture;
+        break;
     case QEvent::TouchUpdate:
         if (d->state() != Qt::NoGesture) {
             QTouchEvent *ev = static_cast<QTouchEvent*>(event);
diff --git a/tests/manual/qgraphicsitemgroup/widget.cpp b/tests/manual/qgraphicsitemgroup/widget.cpp
index b0e7a47cf8..ba9ed815fa 100644
--- a/tests/manual/qgraphicsitemgroup/widget.cpp
+++ b/tests/manual/qgraphicsitemgroup/widget.cpp
@@ -224,7 +224,7 @@ void Widget::updateUngroupButton()
 
 CustomItem * Widget::checkedItem() const
 {
-    CustomItem *item;
+    CustomItem *item = nullptr;
 
     if (ui->blue->isChecked())
         item = rectBlue;
diff --git a/tests/manual/qsysinfo/main.cpp b/tests/manual/qsysinfo/main.cpp
index 62d0c51416..1d39514236 100644
--- a/tests/manual/qsysinfo/main.cpp
+++ b/tests/manual/qsysinfo/main.cpp
@@ -57,6 +57,11 @@ QByteArray windowsVersionToString(QSysInfo::WinVersion v)
     CASE_VERSION(WV_WINDOWS8_1);
     CASE_VERSION(WV_WINDOWS10);
     case QSysInfo::WV_NT_based: // shouldn't happen
+    case QSysInfo::WV_CE:
+    case QSysInfo::WV_CENET:
+    case QSysInfo::WV_CE_5:
+    case QSysInfo::WV_CE_6:
+    case QSysInfo::WV_CE_based:
         break;
     }
 
@@ -82,6 +87,7 @@ QByteArray macVersionToString(QSysInfo::MacVersion v)
     CASE_VERSION(MV_10_9);
     CASE_VERSION(MV_10_10);
     CASE_VERSION(MV_10_11);
+    CASE_VERSION(MV_10_12);
 
     CASE_VERSION(MV_IOS_4_3);
     CASE_VERSION(MV_IOS_5_0);
@@ -96,8 +102,24 @@ QByteArray macVersionToString(QSysInfo::MacVersion v)
     CASE_VERSION(MV_IOS_8_3);
     CASE_VERSION(MV_IOS_8_4);
     CASE_VERSION(MV_IOS_9_0);
+    CASE_VERSION(MV_IOS_9_1);
+    CASE_VERSION(MV_IOS_9_2);
+    CASE_VERSION(MV_IOS_9_3);
+    CASE_VERSION(MV_IOS_10_0);
     case QSysInfo::MV_IOS:      // shouldn't happen:
+    case QSysInfo::MV_TVOS:
+    case QSysInfo::MV_WATCHOS:
         break;
+
+    CASE_VERSION(MV_TVOS_9_0);
+    CASE_VERSION(MV_TVOS_9_1);
+    CASE_VERSION(MV_TVOS_9_2);
+    CASE_VERSION(MV_TVOS_10_0);
+
+    CASE_VERSION(MV_WATCHOS_2_0);
+    CASE_VERSION(MV_WATCHOS_2_1);
+    CASE_VERSION(MV_WATCHOS_2_2);
+    CASE_VERSION(MV_WATCHOS_3_0);
     }
 
     if (v & QSysInfo::MV_IOS) {
diff --git a/tests/manual/qtabletevent/regular_widgets/main.cpp b/tests/manual/qtabletevent/regular_widgets/main.cpp
index c0366dea63..4816e2f3b9 100644
--- a/tests/manual/qtabletevent/regular_widgets/main.cpp
+++ b/tests/manual/qtabletevent/regular_widgets/main.cpp
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
     mainWindow.setWindowTitle(QString::fromLatin1("Tablet Test %1").arg(QT_VERSION_STR));
     EventReportWidget *widget = new EventReportWidget;
     QObject::connect(proximityEventFilter, &ProximityEventFilter::proximityChanged,
-                     widget, QOverload<void>::of(&QWidget::update));
+                     widget, QOverload<>::of(&QWidget::update));
     widget->setMinimumSize(640, 480);
     QMenu *fileMenu = mainWindow.menuBar()->addMenu("File");
     fileMenu->addAction("Clear", widget, &EventReportWidget::clearPoints);
diff --git a/tests/manual/widgets/widgets/widgets.pro b/tests/manual/widgets/widgets/widgets.pro
new file mode 100644
index 0000000000..1fccb09d79
--- /dev/null
+++ b/tests/manual/widgets/widgets/widgets.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = bigmenucreator \
+    defaultUpMenuBar \
+    multiscreen-menus \
+    qtoolbutton/menuOnMultiScreens