QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents

- Since Qt 4.6.0, the frame is drawn by PE_Widget, but there we do not take
  in account the scrollbar for the case where SH_ScrollView_FrameOnlyAroundContents
  is true.
- We also reserved too much space for the border, as we included the
  native border as well in the computation, so do not reserve additional
  space by setting PM_ScrollView_ScrollBarSpacing to 0

Task-number: QTBUG-9821
Reviewed-by: jbache

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">