diff options
| author | Thorbjørn Martsum <tmartsum@gmail.com> | 2013-08-26 08:57:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-28 12:15:43 +0200 |
| commit | fd871694e74debc1bde5a7a19c6a5b94f3069bb2 (patch) | |
| tree | d5430d2c50432adea3629cae7ca61df967351461 /tests | |
| parent | ea94afca565eb2e9586134c9921af23d1e478bb9 (diff) | |
QButtonGroup - add buttonToggled signals
QButtonGroup emits signals on clicked, pressed and released for
buttons in the group, but for some (insuffienct) reason it did
not emit anything for toggle (the only signal that it didn't emit
anything for).
This patch changes that, by adding handling of that signal to
QButtonGroup.
Task-number: QTBUG-14857
Change-Id: I88bcd7b060b78c7ff05ea1adf7baaddfe6d463be
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp | 20 |
2 files changed, 26 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index ffb4526f11..93262722b9 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -490,6 +490,12 @@ void tst_QAbstractButton::toggled() QTest::mouseRelease( testWidget, Qt::LeftButton ); QVERIFY( click_count == 1 ); + + testWidget->setCheckable(true); + testWidget->toggle(); + testWidget->toggle(); + QCOMPARE(int(toggle_count), 2); + testWidget->setCheckable(false); } void tst_QAbstractButton::setShortcut() diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp index c37060f5d5..f027eda6a2 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp @@ -359,6 +359,26 @@ void tst_QButtonGroup::testSignals() QCOMPARE(releasedSpy.count(), 1); QCOMPARE(releasedIdSpy.count(), 1); QVERIFY(releasedIdSpy.takeFirst().at(0).toInt() == 23); + + + QSignalSpy toggledSpy(&buttons, SIGNAL(buttonToggled(QAbstractButton*, bool))); + QSignalSpy toggledIdSpy(&buttons, SIGNAL(buttonToggled(int, bool))); + + pb1.setCheckable(true); + pb2.setCheckable(true); + pb1.toggle(); + QCOMPARE(toggledSpy.count(), 1); + QCOMPARE(toggledIdSpy.count(), 1); + + pb2.toggle(); + QCOMPARE(toggledSpy.count(), 3); // equals 3 since pb1 and pb2 are both toggled + QCOMPARE(toggledIdSpy.count(), 3); + + pb1.setCheckable(false); + pb2.setCheckable(false); + pb1.toggle(); + QCOMPARE(toggledSpy.count(), 3); + QCOMPARE(toggledIdSpy.count(), 3); } void tst_QButtonGroup::task106609() |