diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-23 05:01:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-23 05:01:40 (GMT) |
| commit | d1072c333225ded9e46cf857bef701cc67f6fc1d (patch) | |
| tree | d20b15a94385a78f907350a0f74b9faa905eff3d /tests/auto/qtoolbar/tst_qtoolbar.cpp | |
| parent | 4f35294d737d9059398b2c8f714c8e0ea37079ed (diff) | |
| parent | c42f7058dfd7ea551b2d3bca5651b0c802c91259 (diff) | |
| download | Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.zip Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.tar.gz Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
src/gui/kernel/qaction.h
Diffstat (limited to 'tests/auto/qtoolbar/tst_qtoolbar.cpp')
| -rw-r--r-- | tests/auto/qtoolbar/tst_qtoolbar.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qtoolbar/tst_qtoolbar.cpp b/tests/auto/qtoolbar/tst_qtoolbar.cpp index a762cba..856a935 100644 --- a/tests/auto/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/qtoolbar/tst_qtoolbar.cpp @@ -796,6 +796,10 @@ void tst_QToolBar::toolButtonStyle() tb.setToolButtonStyle(Qt::ToolButtonTextUnderIcon); QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonTextUnderIcon); QCOMPARE(spy.count(), 0); + + tb.setToolButtonStyle(Qt::ToolButtonFollowStyle); + QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonFollowStyle); + QCOMPARE(spy.count(), 1); } { |