From c5d7ea5badb4ccc0cd7027d8629d80809e7ec3d7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 6 Aug 2012 14:30:47 +0200 Subject: Only emit the clicked() signal from views if the left button is used. This is consistent with QAbstractButton, QCalendarWidget, QDialogButtonBox and QGroupBox (ie, all other widgets with a clicked signal) Task-number: QTBUG-26105 Change-Id: Ieafe988b5c03216796b69a7cd70ac1a03fc12b0a Reviewed-by: Marc Mutz Reviewed-by: Olivier Goffart --- .../qabstractitemview/tst_qabstractitemview.cpp | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index b212a6fdf2..890f30a668 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -225,6 +225,7 @@ private slots: void QTBUG6407_extendedSelection(); void QTBUG6753_selectOnSelection(); void testDelegateDestroyEditor(); + void testClickedSignal(); }; class MyAbstractItemDelegate : public QAbstractItemDelegate @@ -1508,6 +1509,30 @@ void tst_QAbstractItemView::testDelegateDestroyEditor() QVERIFY(delegate.calledVirtualDtor); } +void tst_QAbstractItemView::testClickedSignal() +{ + QTableWidget view(5, 5); + + view.show(); + QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(static_cast(&view), QApplication::activeWindow()); + + QModelIndex index49 = view.model()->index(49,0); + QPoint p = view.visualRect(index49).center(); + QVERIFY(view.viewport()->rect().contains(p)); + + QSignalSpy clickedSpy(&view, SIGNAL(clicked(QModelIndex))); + + QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, p); + QCOMPARE(clickedSpy.count(), 1); + + QTest::mouseClick(view.viewport(), Qt::RightButton, 0, p); + // We expect that right-clicks do not cause the clicked() signal to + // be emitted. + QCOMPARE(clickedSpy.count(), 1); + +} QTEST_MAIN(tst_QAbstractItemView) #include "tst_qabstractitemview.moc" -- cgit v1.2.3