diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-24 15:22:19 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-24 15:22:19 (GMT) |
| commit | 97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0 (patch) | |
| tree | dd3645a6afc426a804e73df378c3d47906a8bcf9 /tests/auto/qtabbar | |
| parent | 8eea9828289b842c8a300f1f4309d059b15fd7b0 (diff) | |
| parent | 792e43aa2607d21deeada4b9f14bb82dc96ad4ec (diff) | |
| download | Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.zip Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.gz Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tests/auto/qtabbar')
| -rw-r--r-- | tests/auto/qtabbar/tst_qtabbar.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/qtabbar/tst_qtabbar.cpp index 2db72b9..e83312d 100644 --- a/tests/auto/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/qtabbar/tst_qtabbar.cpp @@ -295,6 +295,10 @@ void tst_QTabBar::setUsesScrollButtons() if (usesArrows != -128) tabBar.setUsesScrollButtons(usesArrows); QTEST(tabBar.usesScrollButtons(), "expectedArrows"); + + // Make sure style sheet does not override user set mode + tabBar.setStyleSheet("QWidget { background-color: #ABA8A6;}"); + QTEST(tabBar.usesScrollButtons(), "expectedArrows"); } void tst_QTabBar::removeLastTab() @@ -532,7 +536,7 @@ void tst_QTabBar::task251184_removeTab() QCOMPARE(bar.count(), 1); QCOMPARE(bar.currentIndex(), 0); - QCOMPARE(bar.tabText(bar.currentIndex()), QString("bar2")); + QCOMPARE(bar.tabText(bar.currentIndex()), QString("bar2")); } |