diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-04-15 18:14:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-17 10:59:13 +0200 |
| commit | 4dbef58c3d2a63f59c5ae32ba9dc47a2a9157474 (patch) | |
| tree | 74e02d69e97e173924ab1a7e24b314861e78c260 /tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp | |
| parent | 7aac93b6ce4e88c8e47c4b2cd8c283daeac5cdb3 (diff) | |
Restore Qt 4 behavior in default double click handler
Revert 3bb902495291c50a2f06e8e03a62a647db3e5cd4. That fix was an attempt
to handle the issue that has been fixed in 5.3 by
9063edef796ad10eb9ac2229627f36d60168f0e2 and should have been reverted
when the new approach, that restores Qt 4 behavior for widgets, was
introduced.
Task-number: QTBUG-38242
Task-number: QTBUG-36423
Change-Id: I8f8a82da22605fac90543492e9b2cd2b568544e7
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 345b8d82ad..06dd623368 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -679,7 +679,8 @@ void tst_QTabBar::tabBarClicked() QCOMPARE(doubleClickSpy.count(), 0); QTest::mouseDClick(&tabBar, button, 0, tabPos); - QCOMPARE(clickSpy.count(), 0); + QCOMPARE(clickSpy.count(), 1); + QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), 0); QCOMPARE(doubleClickSpy.count(), 1); QCOMPARE(doubleClickSpy.takeFirst().takeFirst().toInt(), 0); @@ -691,7 +692,8 @@ void tst_QTabBar::tabBarClicked() QCOMPARE(doubleClickSpy.count(), 0); QTest::mouseDClick(&tabBar, button, 0, barPos); - QCOMPARE(clickSpy.count(), 0); + QCOMPARE(clickSpy.count(), 1); + QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), -1); QCOMPARE(doubleClickSpy.count(), 1); QCOMPARE(doubleClickSpy.takeFirst().takeFirst().toInt(), -1); |