2 files changed, 18 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
index 032189307c..c4961f13a1 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qdialogbuttonbox" RUN_SERIAL SOURCES tst_qdialogbuttonbox.cpp LIBRARIES Qt::Widgets)
+# Generated from qdialogbuttonbox.pro.
+
+#####################################################################
+## tst_qdialogbuttonbox Test:
+#####################################################################
+
+add_qt_test(tst_qdialogbuttonbox
+    SOURCES
+        tst_qdialogbuttonbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 17b0e9ce5f..6a2c8893d2 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -163,7 +163,7 @@ void tst_QDialogButtonBox::testConstructor3_data()
     QTest::addColumn<QDialogButtonBox::StandardButtons>("buttons");
     QTest::addColumn<int>("buttonCount");
 
-    QTest::newRow("nothing") << int(Qt::Horizontal) << (QDialogButtonBox::StandardButtons)0 << 0;
+    QTest::newRow("nothing") << int(Qt::Horizontal) << QDialogButtonBox::StandardButtons{} << 0;
     QTest::newRow("only 1") << int(Qt::Horizontal) << QDialogButtonBox::StandardButtons(QDialogButtonBox::Ok) << 1;
     QTest::newRow("only 1.. twice") << int(Qt::Horizontal)
                         << (QDialogButtonBox::Ok | QDialogButtonBox::Ok)
@@ -199,7 +199,7 @@ void tst_QDialogButtonBox::testConstructor4_data()
     QTest::addColumn<QDialogButtonBox::StandardButtons>("buttons");
     QTest::addColumn<int>("buttonCount");
 
-    QTest::newRow("nothing") << (QDialogButtonBox::StandardButtons)0 << 0;
+    QTest::newRow("nothing") << QDialogButtonBox::StandardButtons{} << 0;
     QTest::newRow("only 1") << QDialogButtonBox::StandardButtons(QDialogButtonBox::Ok) << 1;
     QTest::newRow("only 1.. twice")
                         << (QDialogButtonBox::Ok | QDialogButtonBox::Ok)
@@ -828,6 +828,9 @@ void tst_QDialogButtonBox::testDefaultButton()
 
 void tst_QDialogButtonBox::task191642_default()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QDialog dlg;
     QPushButton *def = new QPushButton(&dlg);
     QSignalSpy clicked(def, SIGNAL(clicked(bool)));