Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	src/network/access/qhttp2protocolhandler_p.h
	src/network/kernel/kernel.pri
	src/network/ssl/qsslkey_qt.cpp
	src/plugins/platforms/cocoa/qcocoascreen.mm
	src/plugins/platforms/windows/accessible/iaccessible2.cpp
	src/plugins/platforms/windows/accessible/iaccessible2.h
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
	src/widgets/widgets/qmenu_p.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp
	tests/auto/testlib/selftests/expected_cmptest.lightxml
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/testlib/selftests/expected_cmptest.xml

Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9

10 files changed, 389 insertions, 22 deletions

diff --git a/tests/manual/cocoa/menurama/mainwindow.cpp b/tests/manual/cocoa/menurama/mainwindow.cpp
index 06867bd7c9..086fc1e2fa 100644
--- a/tests/manual/cocoa/menurama/mainwindow.cpp
+++ b/tests/manual/cocoa/menurama/mainwindow.cpp
@@ -37,6 +37,11 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
+    auto *a = ui->menuStuff->addAction("Enabled Submenu (QTBUG-63172)");
+    auto *qtbug63172_Menu = new QMenu;
+    qtbug63172_Menu->addAction("We're Good!");
+    a->setMenu(qtbug63172_Menu);
+
     startTimer(1000);
 
     connect(ui->menuAfter_aboutToShow, &QMenu::aboutToShow, [=] {
diff --git a/tests/manual/cocoa/menurama/mainwindow.ui b/tests/manual/cocoa/menurama/mainwindow.ui
index 18cded70d2..4fb3e3420e 100644
--- a/tests/manual/cocoa/menurama/mainwindow.ui
+++ b/tests/manual/cocoa/menurama/mainwindow.ui
@@ -131,6 +131,7 @@ Click on "Dynamic Stuff" then move left and right to other menus. Disa
     <addaction name="menuSubmenu"/>
     <addaction name="actionDisabled_Item"/>
     <addaction name="menuDisabled_Submenu"/>
+    <addaction name="separator"/>
    </widget>
    <widget class="QMenu" name="menuDisabled_Stuff">
     <property name="enabled">
diff --git a/tests/manual/cocoa/nativewidgets/main.cpp b/tests/manual/cocoa/nativewidgets/main.cpp
index bfa97aa62f..3923e30de7 100644
--- a/tests/manual/cocoa/nativewidgets/main.cpp
+++ b/tests/manual/cocoa/nativewidgets/main.cpp
@@ -37,7 +37,7 @@ class ColorWidget : public QWidget
 
     void changeColor()
     {
-        color.setHsv((qreal(qrand()) / RAND_MAX) * 50 + 200, s, s);
+        color.setHsv(QRandomGenerator::global()->bounded(50) + 200, s, s);
     }
 
 public:
diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp
index 9bd6d036af..eb6d09b9c8 100644
--- a/tests/manual/textrendering/textperformance/main.cpp
+++ b/tests/manual/textrendering/textperformance/main.cpp
@@ -30,6 +30,7 @@
 #include <QDialog>
 #include <QFontDatabase>
 #include <QPainter>
+#include <QRandomGenerator>
 #include <QTime>
 #include <QTimer>
 
@@ -93,17 +94,17 @@ public:
         static const QString text = QLatin1String("Qt rocks!!!");
         static const int textsPerPaint = 30;
         for (int i = 0; i < textsPerPaint; i++) {
-            const int fontSize = 4 + (qrand() % 5);
-            const int fontWeight = (qrand() % 2) == 1 ? QFont::Normal : QFont::Bold;
-            const bool fontItalic = (qrand() % 2) == 1;
+            const int fontSize = 4 + QRandomGenerator::global()->bounded(5);
+            const int fontWeight = QRandomGenerator::global()->bounded(2) == 1 ? QFont::Normal : QFont::Bold;
+            const bool fontItalic = QRandomGenerator::global()->bounded(2) == 1;
             const QFont font("Default", fontSize, fontWeight, fontItalic);
             p.setFont(font);
-            p.setPen(QColor::fromHsv(qrand() % 359, 155 + qrand() % 100,
-                                     155 + qrand() % 100, 100 + qrand() % 155));
+            p.setPen(QColor::fromHsv(QRandomGenerator::global()->bounded(359), 155 + QRandomGenerator::global()->bounded(100),
+                                     155 + QRandomGenerator::global()->bounded(100), 100 + QRandomGenerator::global()->bounded(155)));
             const QSize textSize(p.fontMetrics().boundingRect(text).size());
             const QPoint position(
-                -textSize.width() / 2 + (qrand() % size.width()),
-                textSize.height() / 2 + (qrand() % size.height()));
+                -textSize.width() / 2 + QRandomGenerator::global()->bounded(size.width()),
+                textSize.height() / 2 + QRandomGenerator::global()->bounded(size.height()));
             p.drawText(position, text);
         }
     }
@@ -126,8 +127,8 @@ public:
 
         QString text;
         for (int i = 0; i < piecesPerPaint; ++i) {
-            QString piece = QLatin1String(pieces[qrand() % piecesCount]);
-            if (i == 0 || qrand() % 2) {
+            QString piece = QLatin1String(pieces[QRandomGenerator::global()->bounded(piecesCount)]);
+            if (i == 0 || QRandomGenerator::global()->bounded(2)) {
                 // Make this piece the beginning of a new sentence.
                 piece[0] = piece[0].toUpper();
                 if (i > 0)
@@ -160,7 +161,7 @@ public:
         for (int i = 0; i < systemsPerPaint; i++) {
             if (i > 0)
                 text.append(QLatin1Char(' '));
-            text.append(samples.at(qrand() % samples.count()));
+            text.append(samples.at(QRandomGenerator::global()->bounded(samples.count())));
         }
         p.drawText(QRectF(QPointF(0, 0), QSizeF(size)),
                    Qt::AlignTop | Qt::AlignAbsolute | Qt::TextWordWrap, text);
diff --git a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro
new file mode 100644
index 0000000000..69fbea3834
--- /dev/null
+++ b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro
@@ -0,0 +1,34 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2017-10-19T16:07:04
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = BigMenuCreator
+TEMPLATE = app
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which as been marked as deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+
+SOURCES += \
+        main.cpp \
+        mainwindow.cpp
+
+HEADERS += \
+        mainwindow.h
+
+FORMS += \
+        mainwindow.ui
diff --git a/tests/manual/widgets/widgets/bigmenucreator/main.cpp b/tests/manual/widgets/widgets/bigmenucreator/main.cpp
new file mode 100644
index 0000000000..303552c1d5
--- /dev/null
+++ b/tests/manual/widgets/widgets/bigmenucreator/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include <QApplication>
+#include <QCommandLineParser>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription("BigMenuCreator");
+    parser.addHelpOption();
+    parser.addOptions({
+        { "new-menubar", QLatin1String("Use new menubar instead of QMainWindow's own.") },
+        { "no-parent", QLatin1String("When using a new menubar, do *not* set its parent on construction.") }
+    });
+
+    parser.process(a);
+
+    MainWindow::newMenubar = parser.isSet("new-menubar");
+    MainWindow::parentlessMenubar = parser.isSet("no-parent");
+
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}
diff --git a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.cpp b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.cpp
new file mode 100644
index 0000000000..5b30c1be0b
--- /dev/null
+++ b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+bool MainWindow::newMenubar = false;
+bool MainWindow::parentlessMenubar = false;
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+
+    const int level = 3;
+    QMenuBar *mb;
+    if (newMenubar)
+        mb = new QMenuBar(parentlessMenubar ? nullptr : this);
+    else
+        mb = ui->menuBar;
+    populateMenu(mb, level);
+    if (newMenubar)
+        setMenuBar(mb);
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}
+
+// We do all the permutations on the following 3 operations:
+//
+//      A: Add action to parent menu
+//      P: Populate the submenu
+//      S: Set action submenu
+//
+// Recursing on menu population gives more combinations of
+// creation and insertions.
+
+void MainWindow::populateMenu(QWidget *menu, int level)
+{
+    if (level > 0) {
+        --level;
+        doAPS(menu, level);
+        doASP(menu, level);
+        doPAS(menu, level);
+        doSPA(menu, level);
+        doSAP(menu, level);
+        doPSA(menu, level);
+    } else {
+        static int itemCounter = 0;
+        static const char *sym[] = { "Foo", "Bar", "Baz", "Quux" };
+        for (uint i = 0; i < sizeof(sym) / sizeof(sym[0]); i++) {
+            QString title = QString::fromLatin1("%1 Item %2").arg(QLatin1String(sym[i])).arg(itemCounter);
+            menu->addAction(new QAction(title));
+        }
+        ++itemCounter;
+    }
+}
+
+void MainWindow::doAPS(QWidget *menu, int level)
+{
+    auto *action = new QAction("A P S");
+    menu->addAction(action);
+    auto *submenu = new QMenu;
+    populateMenu(submenu, level);
+    action->setMenu(submenu);
+}
+
+void MainWindow::doASP(QWidget *menu, int level)
+{
+    auto *action = new QAction("A S P");
+    menu->addAction(action);
+    auto *submenu = new QMenu;
+    action->setMenu(submenu);
+    populateMenu(submenu, level);
+}
+
+void MainWindow::doPAS(QWidget *menu, int level)
+{
+    auto *submenu = new QMenu;
+    populateMenu(submenu, level);
+    auto *action = new QAction("P A S");
+    menu->addAction(action);
+    action->setMenu(submenu);
+}
+
+void MainWindow::doSPA(QWidget *menu, int level)
+{
+    auto *action = new QAction("S P A");
+    auto *submenu = new QMenu;
+    action->setMenu(submenu);
+    populateMenu(submenu, level);
+    menu->addAction(action);
+}
+
+void MainWindow::doSAP(QWidget *menu, int level)
+{
+    auto *action = new QAction("S A P");
+    auto *submenu = new QMenu;
+    action->setMenu(submenu);
+    menu->addAction(action);
+    populateMenu(submenu, level);
+}
+
+void MainWindow::doPSA(QWidget *menu, int level)
+{
+    auto *action = new QAction("P S A");
+    auto *submenu = new QMenu;
+    populateMenu(submenu, level);
+    action->setMenu(submenu);
+    menu->addAction(action);
+}
diff --git a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h
new file mode 100644
index 0000000000..2990f592e9
--- /dev/null
+++ b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+    void doAPS(QWidget *menu, int level);
+    void doASP(QWidget *menu, int level);
+    void doPAS(QWidget *menu, int level);
+
+    void doSPA(QWidget *menu, int level);
+    void doSAP(QWidget *menu, int level);
+    void doPSA(QWidget *menu, int level);
+
+    void populateMenu(QWidget *menu, int level);
+
+    static bool newMenubar;
+    static bool parentlessMenubar;
+
+private:
+    Ui::MainWindow *ui;
+};
+
+#endif // MAINWINDOW_H
diff --git a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.ui b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.ui
new file mode 100644
index 0000000000..0668202ea5
--- /dev/null
+++ b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.ui
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>427</width>
+    <height>372</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QLabel" name="label">
+      <property name="font">
+       <font>
+        <pointsize>16</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.SF NS Text'; font-size:16pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;We do all the permutations on the following 3 operations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;    A&lt;/span&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;: Add action to parent menu&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;    P&lt;/span&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;: Populate the submenu&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;    S&lt;/span&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;: Set action submenu&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;This gets repeated 2 menu levels from the menubar. All menus and items are enabled and should show as such.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;The order of menus is APS, ASP, PAS, SPA, SAP, PSA.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;The order of terminal items is &amp;quot;Foo&amp;quot;, &amp;quot;Bar&amp;quot;, &amp;quot;Baz&amp;quot;, &amp;quot;Quux&amp;quot;.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;Rerun with &amp;quot;--new-menubar&amp;quot; and &amp;quot;--no-parent&amp;quot; to force using a new menubar instead of QMainWindow's own, with or without parent. QMainWindow::setMenuBar() will be called regardless of the parent option.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>427</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/manual/windowchildgeometry/controllerwidget.cpp b/tests/manual/windowchildgeometry/controllerwidget.cpp
index 1d18c5d51b..871313d983 100644
--- a/tests/manual/windowchildgeometry/controllerwidget.cpp
+++ b/tests/manual/windowchildgeometry/controllerwidget.cpp
@@ -29,16 +29,12 @@
 #include "controllerwidget.h"
 #include <controls.h>
 
-#if QT_VERSION >= 0x050000
-#    include <QtWidgets>
-#    include <QWindow>
-#    include <QBackingStore>
-#    include <QPaintDevice>
-#    include <QPainter>
-#else
-#    include <QtGui>
-#endif
-
+#include <QtWidgets>
+#include <QWindow>
+#include <QBackingStore>
+#include <QPaintDevice>
+#include <QPainter>
+#include <QRandomGenerator>
 #include <QResizeEvent>
 
 CoordinateControl::CoordinateControl(const QString &sep) : m_x(new QSpinBox), m_y(new QSpinBox)
@@ -280,7 +276,7 @@ public:
     explicit Window(QWindow *parent = 0)
         : QWindow(parent)
         , m_backingStore(new QBackingStore(this))
-        , m_color(Qt::GlobalColor(qrand() % 18))
+        , m_color(Qt::GlobalColor(QRandomGenerator::global()->bounded(18)))
     {
         setObjectName(QStringLiteral("window"));
         setTitle(tr("TestWindow"));