2 files changed, 22 insertions, 1 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 09e070ac20..eafd4d7cea 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -48,6 +48,7 @@
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qmenu.h>
+#include <qrandom.h>
 #include "../../../../../src/widgets/dialogs/qsidebar_p.h"
 #include "../../../../../src/widgets/dialogs/qfilesystemmodel_p.h"
 #include "../../../../../src/widgets/dialogs/qfiledialog_p.h"
@@ -1196,7 +1197,7 @@ void tst_QFileDialog2::QTBUG6558_showDirsOnly()
 {
     const QString tempPath = tempDir.path();
     QDir dirTemp(tempPath);
-    const QString tempName = QLatin1String("showDirsOnly.") + QString::number(qrand());
+    const QString tempName = QLatin1String("showDirsOnly.") + QString::number(QRandomGenerator::global()->generate());
     dirTemp.mkdir(tempName);
     dirTemp.cd(tempName);
     QTRY_VERIFY(dirTemp.exists());
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index db86fba59c..6ad93b2666 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -96,6 +96,7 @@ private slots:
     void task248107_backButton();
     void task255350_fieldObjectDestroyed();
     void taskQTBUG_25691_fieldObjectDestroyed2();
+    void taskQTBUG_46894_nextButtonShortcut();
 
     /*
         Things that could be added:
@@ -2700,5 +2701,24 @@ void tst_QWizard::taskQTBUG_25691_fieldObjectDestroyed2()
     ::taskQTBUG_25691_fieldObjectDestroyed2();
 }
 
+void tst_QWizard::taskQTBUG_46894_nextButtonShortcut()
+{
+    for (int i = 0; i < QWizard::NStyles; ++i) {
+        QWizard wizard;
+        QWizard::WizardStyle style = static_cast<QWizard::WizardStyle>(i);
+        wizard.setWizardStyle(style);
+        wizard.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&wizard));
+
+        if (wizard.button(QWizard::NextButton)->text() == "&Next") {
+            QCOMPARE(wizard.button(QWizard::NextButton)->shortcut(),
+                     QKeySequence(Qt::ALT | Qt::Key_Right));
+        } else {
+            QCOMPARE(wizard.button(QWizard::NextButton)->shortcut(),
+                     QKeySequence::mnemonic(wizard.button(QWizard::NextButton)->text()));
+        }
+    }
+}
+
 QTEST_MAIN(tst_QWizard)
 #include "tst_qwizard.moc"