2 files changed, 15 insertions, 10 deletions
diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
index 4f8e9a4a5c..bbe7bddd9d 100644
--- a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qwizard
-    GUI
     SOURCES
         tst_qwizard.cpp
         tst_qwizard_2.cpp
@@ -15,16 +14,17 @@ add_qt_test(tst_qwizard
 )
 
 # Resources:
+set(qwizard_resource_files
+    "images/background.png"
+    "images/banner.png"
+    "images/logo.png"
+    "images/watermark.png"
+)
+
 add_qt_resource(tst_qwizard "qwizard"
     PREFIX
         "/"
     FILES
-        images/background.png
-        images/banner.png
-        images/logo.png
-        images/watermark.png
+        ${qwizard_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:qwizard.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 6091975acb..dae274a8b6 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -96,8 +96,9 @@ private slots:
     void task248107_backButton();
     void task255350_fieldObjectDestroyed();
     void taskQTBUG_25691_fieldObjectDestroyed2();
+#if QT_CONFIG(shortcut)
     void taskQTBUG_46894_nextButtonShortcut();
-
+#endif
     /*
         Things that could be added:
 
@@ -237,7 +238,7 @@ void tst_QWizard::setButtonLayout()
 
     QWizard wizard;
     wizard.setWizardStyle(QWizard::ClassicStyle);
-    wizard.setOptions(0);
+    wizard.setOptions({});
     wizard.setButtonLayout(layout);
     wizard.show();
     qApp->processEvents();
@@ -2703,6 +2704,8 @@ void tst_QWizard::taskQTBUG_25691_fieldObjectDestroyed2()
     ::taskQTBUG_25691_fieldObjectDestroyed2();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QWizard::taskQTBUG_46894_nextButtonShortcut()
 {
     for (int i = 0; i < QWizard::NStyles; ++i) {
@@ -2717,5 +2720,7 @@ void tst_QWizard::taskQTBUG_46894_nextButtonShortcut()
     }
 }
 
+#endif // QT_CONFIG(shortcut)
+
 QTEST_MAIN(tst_QWizard)
 #include "tst_qwizard.moc"