diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-17 16:11:42 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-20 09:05:28 +0100 |
| commit | 9d563e605bc5ed7fd2b7877cae6efc132debb7ce (patch) | |
| tree | d209e52c1466626b8034073eb5a1b6d89c40a3da /tests | |
| parent | 498cf6a455230568b62c1b1a2b94d81fee912f63 (diff) | |
Prepare QGuiAction::enabled property for declarative use
Make the order of visible, group and enabled insignificant, by storing
ignored explicit values of enabled.
Also adds resetEnabled method QQuickAction has on the enabled property.
Change-Id: I9299dec0d1f74fdf655721bb4f72ba565ae85c7a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp b/tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp index 9d45d4ae14..3f314a74ae 100644 --- a/tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp +++ b/tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp @@ -56,6 +56,7 @@ private slots: #endif void task229128TriggeredSignalWithoutActiongroup(); void setData(); + void setEnabledSetVisible(); private: const int m_keyboardScheme; @@ -206,5 +207,29 @@ void tst_QGuiAction::setData() // QTBUG-62006 QCOMPARE(spy.count(), 1); } +void tst_QGuiAction::setEnabledSetVisible() +{ + QGuiAction action(nullptr); + QSignalSpy spy(&action, &QGuiAction::enabledChanged); + QVERIFY(action.isEnabled()); + QVERIFY(action.isVisible()); + QCOMPARE(spy.count(), 0); + action.setVisible(false); + QVERIFY(!action.isEnabled()); + QVERIFY(!action.isVisible()); + QCOMPARE(spy.count(), 1); + action.setEnabled(false); + QVERIFY(!action.isEnabled()); + QVERIFY(!action.isVisible()); + QCOMPARE(spy.count(), 1); + action.setVisible(true); + QVERIFY(!action.isEnabled()); + QVERIFY(action.isVisible()); + QCOMPARE(spy.count(), 1); + action.resetEnabled(); + QVERIFY(action.isEnabled()); + QCOMPARE(spy.count(), 2); +} + QTEST_MAIN(tst_QGuiAction) #include "tst_qguiaction.moc" |