From 6d59f9d6d1aab4f22002f9143088c2c6b3023ebf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 26 Nov 2019 12:50:33 +0100 Subject: Avoid initializing QFlags with 0 or nullptr in tests It is being deprecated. Amends d1697d81866abaf217b6647b0f42a13fa974636b. Change-Id: I7ec2e8d5d07b86eebeb9e16c35f70e3c93a4b037 Reviewed-by: Mitch Curtis --- tests/auto/dialogs/tst_dialogs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp index 2ee81c9b..a9c9b5e6 100644 --- a/tests/auto/dialogs/tst_dialogs.cpp +++ b/tests/auto/dialogs/tst_dialogs.cpp @@ -268,11 +268,11 @@ void tst_dialogs::fileDialogDefaultModality() // Click to show QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); QSignalSpy spyVisibilityChanged(dlg, SIGNAL(visibilityChanged())); - QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100)); // show + QTest::mouseClick(window, Qt::LeftButton, {}, QPoint(1000, 100)); // show QTRY_VERIFY(spyVisibilityChanged.count() > 0); int visibilityChangedCount = spyVisibilityChanged.count(); // Can't hide by clicking the main window, because dialog is modal. - QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100)); + QTest::mouseClick(window, Qt::LeftButton, {}, QPoint(1000, 100)); /* On OS X, if you send an event directly to a window, the modal dialog doesn't block the event, so the window will process it normally. This @@ -315,11 +315,11 @@ void tst_dialogs::fileDialogNonModal() QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); dlg->setProperty("modality", QVariant((int)Qt::NonModal)); QSignalSpy spyVisibilityChanged(dlg, SIGNAL(visibilityChanged())); - QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100)); // show + QTest::mouseClick(window, Qt::LeftButton, {}, QPoint(1000, 100)); // show QTRY_VERIFY(spyVisibilityChanged.count() > 0); int visibilityChangedCount = spyVisibilityChanged.count(); QCOMPARE(dlg->property("visible").toBool(), true); - QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100)); // hide + QTest::mouseClick(window, Qt::LeftButton, {}, QPoint(1000, 100)); // hide QTRY_VERIFY(spyVisibilityChanged.count() > visibilityChangedCount); QCOMPARE(dlg->property("visible").toBool(), false); #ifdef Q_OS_WIN -- cgit v1.2.1