diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 12:45:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 12:45:48 (GMT) |
| commit | 8cf08f2640e31615bba0cc61544642855dc1275e (patch) | |
| tree | 7734bbaad929c6d461e0b71f9007a9a41ffe6149 /tests/auto | |
| parent | ccd85016aa7d95495ab113bd5cecc62769a5fad4 (diff) | |
| parent | fcd009cd77f95106f4522103bab9aaf86109a17d (diff) | |
| download | Qt-8cf08f2640e31615bba0cc61544642855dc1275e.zip Qt-8cf08f2640e31615bba0cc61544642855dc1275e.tar.gz Qt-8cf08f2640e31615bba0cc61544642855dc1275e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/uiloader/baseline/css_scroll.ui | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/uiloader/baseline/css_scroll.ui b/tests/auto/uiloader/baseline/css_scroll.ui index 0537ab0..6ac6886 100644 --- a/tests/auto/uiloader/baseline/css_scroll.ui +++ b/tests/auto/uiloader/baseline/css_scroll.ui @@ -14,8 +14,10 @@ <string>Form</string> </property> <property name="styleSheet"> - <string notr="true">QScrollArea { background:red; } -QScrollArea .QWidget { background:transparent; } + <string notr="true">QScrollArea { background:red; + border: 5px dashed blue; } +QScrollArea .QWidget { background:transparent; + border: 5px dotted green;} QScrollArea::corner { background:yellow; } @@ -111,10 +113,10 @@ QScrollArea::corner { background:yellow; } <widget class="QWidget" name="scrollAreaWidgetContents"> <property name="geometry"> <rect> - <x>-60</x> - <y>-145</y> - <width>554</width> - <height>575</height> + <x>0</x> + <y>0</y> + <width>520</width> + <height>532</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_3"> |