From b46dd452d2053de97807535b6701c7bf64e7dea9 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Tue, 29 Jul 2014 09:41:45 +0200
Subject: [PATCH] QmlDesigner.PropertyEditor: Use DesignerScrollViewStyle

I set corner to an empty item, because otherwise it looks weird if both
scrollbars are visible.

Change-Id: I149e2ff58f9e9f71b2bb9f435fd64388cbf5529c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 .../qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml  | 1 +
 .../propertyEditorQmlSources/HelperWidgets/ScrollView.qml     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml
index 1c90f7fc4f3..173eaac7925 100644
--- a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml
+++ b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml
@@ -58,4 +58,5 @@ ScrollViewStyle {
 
     decrementControl: Item {}
     incrementControl: Item {}
+    corner: Item {}
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml
index 54d68e7485b..0a7ba0098a0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml
@@ -1,6 +1,10 @@
 import QtQuick 2.1
 import QtQuick.Controls 1.0 as Controls
+import "../../common/"
 
 Controls.ScrollView {
+    style: DesignerScrollViewStyle {
 
+    }
+    frameVisible: false
 }