diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:06 +0100 |
| commit | 8c31769dbb1cfa93416260c2ddcd712587187c80 (patch) | |
| tree | 733471de63e165b8737343b80fa0b6987bcc5a53 /tests/auto/dialogs/tst_dialogs.cpp | |
| parent | b9251c72a19d67c89a8fe8ee8799e59f7f79c5cc (diff) | |
| parent | 6d59f9d6d1aab4f22002f9143088c2c6b3023ebf (diff) | |
| download | qtquickcontrols-8c31769dbb1cfa93416260c2ddcd712587187c80.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I87e8f3e363c7514b0cd9004b848ee0ca607548a6
Diffstat (limited to 'tests/auto/dialogs/tst_dialogs.cpp')
| -rw-r--r-- | tests/auto/dialogs/tst_dialogs.cpp | 8 |
1 files 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<QObject *>(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<QObject *>(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 |