From 1cec731d40f6ed8a7755c9e3c0d100afbe099ed8 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Sun, 20 Mar 2016 06:56:33 +0100
Subject: ScrollIndicator: use contentItem instead of indicator

Thanks to virtual resizeContent() we can finally use contentItem like
everywhere else, and cleanup the special indicator item.

Change-Id: Ia2bd62684d49a05c199e490750a31c13d2c22182
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 ...qtquickcontrols-scrollindicator-contentItem.qml | 42 ++++++++++++++++++++++
 .../qtquickcontrols-scrollindicator-indicator.qml  | 42 ----------------------
 2 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml
 delete mode 100644 src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-indicator.qml

(limited to 'src/imports/controls/doc/snippets')

diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml
new file mode 100644
index 00000000..ef85fe69
--- /dev/null
+++ b/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import Qt.labs.controls 1.0
+
+ScrollIndicator {
+    size: 0.5
+    position: 0.5
+    active: true
+    height: 100
+    Rectangle {
+        parent: contentItem
+        anchors.fill: parent
+        color: "transparent"
+        border.color: "red"
+    }
+}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-indicator.qml
deleted file mode 100644
index 68e0fb33..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-indicator.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import Qt.labs.controls 1.0
-
-ScrollIndicator {
-    size: 0.5
-    position: 0.5
-    active: true
-    height: 100
-    Rectangle {
-        parent: indicator
-        anchors.fill: parent
-        color: "transparent"
-        border.color: "red"
-    }
-}
-- 
cgit v1.2.3