diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 15:27:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 15:27:13 (GMT) |
| commit | cfac0f3a89bd92955047bf15908a2e7bedd91db0 (patch) | |
| tree | f7352a1d81edff983b1b5d027d985b4e1a0514bd /tests | |
| parent | c2d213becf8f96257789ebeb3ab074733da36424 (diff) | |
| parent | 707610b9f07ad96318e6d84f321588c060c0c294 (diff) | |
| download | Qt-cfac0f3a89bd92955047bf15908a2e7bedd91db0.zip Qt-cfac0f3a89bd92955047bf15908a2e7bedd91db0.tar.gz Qt-cfac0f3a89bd92955047bf15908a2e7bedd91db0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove the installer from the Qt sources.
Fixes qabstractslider autotest
Add a recursive rule for running the auto-tests.
Do not run the tests automatically during install.
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 8 | ||||
| -rw-r--r-- | tests/auto/qabstractslider/tst_qabstractslider.cpp | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 3198a65..022b19a 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -587,3 +587,11 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative xmlpatternsview \ xmlpatternsxqts \ xmlpatternsxslts + + +############### make check recursively for testcases ################## +check.CONFIG = recursive +check.recurse = $$SUBDIRS +check.recurse_target = check +QMAKE_EXTRA_TARGETS += check +########################################################### diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp index 40281c6..293af36 100644 --- a/tests/auto/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp @@ -768,7 +768,7 @@ void tst_QAbstractSlider::wheelEvent_data() << true // inverted controls << 20 // wheel scroll lines << false // with modifiers - << 1 // delta + << -1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 30 // expected position after @@ -782,7 +782,7 @@ void tst_QAbstractSlider::wheelEvent_data() << false // inverted controls << 1 // wheel scroll lines << false // with modifiers - << 2 // delta + << -2 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 100 // expected position after @@ -796,7 +796,7 @@ void tst_QAbstractSlider::wheelEvent_data() << false // inverted controls << 1 // wheel scroll lines << false // with modifiers - << -2 // delta + << 2 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 0 // expected position after @@ -810,7 +810,7 @@ void tst_QAbstractSlider::wheelEvent_data() << false // inverted controls << 20 // wheel scroll lines << true // with modifiers - << 1 // delta + << -1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 90 // expected position after |