diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-23 10:11:11 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-23 10:11:11 (GMT) |
| commit | a315c693d0f3dd64711b8459d86b89ddc48e8c1a (patch) | |
| tree | 8f966269d797f97d41847c5bb7283297cee20b47 /tests/auto/qstyle | |
| parent | d37a3529ec883985b2967265f0797d749db74308 (diff) | |
| parent | e6694ebe4081b807b1bb0946e17e73840019ec6d (diff) | |
| download | Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.zip Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.tar.gz Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
Diffstat (limited to 'tests/auto/qstyle')
| -rw-r--r-- | tests/auto/qstyle/tst_qstyle.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index ba24225..9c754d2 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -413,6 +413,13 @@ void tst_QStyle::testWindowsStyle() QWindowsStyle wstyle; testAllFunctions(&wstyle); lineUpLayoutTest(&wstyle); + + // Tests drawing indeterminate progress with 0 size: QTBUG-15973 + QStyleOptionProgressBar pb; + pb.rect = QRect(0,0,-9,0); + QPixmap surface(QSize(200, 200)); + QPainter painter(&surface); + wstyle.drawControl(QStyle::CE_ProgressBar, &pb, &painter, 0); } void tst_QStyle::testWindowsXPStyle() |