diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-30 16:14:03 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-30 16:14:03 (GMT) |
commit | 570f8970bea646055583671397c3d2706ac45004 (patch) | |
tree | 6e68ed9939ad6ca87ffa17bbfec803b4f3089783 /tests | |
parent | 597117790ad86a1e68526fa7ccd1a38fca2b55f3 (diff) | |
parent | 20dbb967f030041d1dc94b989b0b085ca84baa33 (diff) | |
download | Qt-570f8970bea646055583671397c3d2706ac45004.zip Qt-570f8970bea646055583671397c3d2706ac45004.tar.gz Qt-570f8970bea646055583671397c3d2706ac45004.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QHeaderView test case for VGA Symbian devices.
Fix for BCM2727 chip detection on Symbian
Fix QMenuBar autotest failures for Symbian
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qheaderview/tst_qheaderview.cpp | 12 | ||||
-rw-r--r-- | tests/auto/qmenubar/tst_qmenubar.cpp | 10 |
2 files changed, 21 insertions, 1 deletions
diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp index 3a659aa..52eeee4 100644 --- a/tests/auto/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/qheaderview/tst_qheaderview.cpp @@ -563,7 +563,7 @@ void tst_QHeaderView::sectionSize() QFETCH(int, lastVisibleSectionSize); QFETCH(int, persistentSectionSize); -#ifdef Q_OS_WINCE +#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) // We test on a device with doubled pixels. Therefore we need to specify // different boundaries. initialDefaultSize = qMax(view->minimumSectionSize(), 30); @@ -676,6 +676,16 @@ void tst_QHeaderView::visualIndexAt() QFETCH(QList<int>, coordinate); QFETCH(QList<int>, visual); +#ifdef Q_OS_SYMBIAN + // Some Symbian devices have larger minimum section size than what is expected. + // Need to do this here instead of visualIndexAt_data() as view pointer doesn't + // seem to be valid there. + int minSize = view->minimumSectionSize(); + if (minSize > 30) { + coordinate.clear(); + coordinate << -1 << 0 << minSize + 1 << (minSize * 3) + 1 << 99999; + } +#endif view->setStretchLastSection(true); topLevel->show(); diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index 72048d9..d548a51 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -515,6 +515,10 @@ void tst_QMenuBar::activatedCount_noQt3() #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); #endif +#ifdef Q_OS_SYMBIAN + QSKIP("On Symbian OS, native key events are needed to test menu action activation", SkipAll); +#endif + // create a popup menu with menu items set the accelerators later... initSimpleMenubar_noQt3(); @@ -1573,6 +1577,12 @@ void tst_QMenuBar::task256322_highlight() file2->setText("file2"); QAction *nothing = win.menuBar()->addAction("nothing"); +#ifdef Q_WS_S60 + // Set minimum width to ensure that menu items are not added to the menu extension. + // Minimum width 360 is the minimal screen width in any supported Symbian device. + win.menuBar()->setMinimumWidth(360); +#endif + win.show(); QTest::qWait(200); |