summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qtoolbar
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-27 08:40:55 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-27 08:41:33 +0100
commitd3814e51bb1c19aa868566aea5d4edd19d2e3944 (patch)
tree1d7606bd0cb1167cecc733141998a2d0cca918d7 /tests/auto/widgets/widgets/qtoolbar
parent719ad1db552319529bb5978fabbae1af9a06c240 (diff)
parent2260d680c935eae0e989beb2040a01040f66a5fa (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'tests/auto/widgets/widgets/qtoolbar')
-rw-r--r--tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index 1e71f92361..1d5ac7c819 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -553,7 +553,7 @@ void tst_QToolBar::actionGeometry()
QToolBarExtension *extension = extensions.at(0);
if (extension->isVisible()) {
QRect rect0 = extension->geometry();
- QTest::mouseClick( extension, Qt::LeftButton, 0, rect0.center(), -1 );
+ QTest::mouseClick( extension, Qt::LeftButton, {}, rect0.center(), -1 );
QApplication::processEvents();
popupMenu = qobject_cast<QMenu *>(extension->menu());
rect01 = popupMenu->actionGeometry(&action1);
@@ -875,7 +875,7 @@ void tst_QToolBar::actionTriggered()
QToolBarExtension *extension = extensions.at(0);
if (extension->isVisible()) {
QRect rect0 = extension->geometry();
- QTest::mouseClick( extension, Qt::LeftButton, 0, rect0.center(), -1 );
+ QTest::mouseClick( extension, Qt::LeftButton, {}, rect0.center(), -1 );
QApplication::processEvents();
popupMenu = qobject_cast<QMenu *>(extension->menu());
rect01 = popupMenu->actionGeometry(&action1);
@@ -916,28 +916,28 @@ void tst_QToolBar::actionTriggered()
if (!rect01.isValid())
QTest::mouseClick(button1, Qt::LeftButton);
else
- QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect01.center(), -1 );
+ QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect01.center(), -1 );
QCOMPARE(::triggered, &action1);
::triggered = 0;
if (!rect02.isValid())
QTest::mouseClick(button2, Qt::LeftButton);
else
- QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect02.center(), -1 );
+ QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect02.center(), -1 );
QCOMPARE(::triggered, &action2);
::triggered = 0;
if (!rect03.isValid())
QTest::mouseClick(button3, Qt::LeftButton);
else
- QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect03.center(), -1 );
+ QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect03.center(), -1 );
QCOMPARE(::triggered, &action3);
::triggered = 0;
if (!rect04.isValid())
QTest::mouseClick(button4, Qt::LeftButton);
else
- QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect04.center(), -1 );
+ QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect04.center(), -1 );
QCOMPARE(::triggered, &action4);
}