From a4ce44f42602171c216cf59c53c5c537e699ee99 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Date: Tue, 25 Aug 2020 16:56:01 +0200
Subject: Native style: move DesktopGallery to manual tests, and rename to
 nativestyle

This should not be shipped as an example in it's current state. But
the app is needed for now as a manual test while we develop the styles.

Change-Id: I719ec629789bc4c8b51d14c97afd7b91b822e89b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/manual/nativestyle/Sliders.qml | 132 +++++++++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 tests/manual/nativestyle/Sliders.qml

(limited to 'tests/manual/nativestyle/Sliders.qml')

diff --git a/tests/manual/nativestyle/Sliders.qml b/tests/manual/nativestyle/Sliders.qml
new file mode 100644
index 00000000..dba0794b
--- /dev/null
+++ b/tests/manual/nativestyle/Sliders.qml
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 2.15
+
+ControlContainer {
+    id: container
+    title: "Sliders normal"
+    property int sliderWidth: 300
+    property int sliderHeight: 140
+
+    Row {
+        spacing: 40
+
+        Column {
+            spacing: 15
+
+            Slider {
+                width: sliderWidth
+                from: 0
+                to: 10
+                value: 5
+            }
+
+            Slider {
+                width: sliderWidth
+                from: 0
+                to: 10
+                value: 5
+                enabled: false
+            }
+
+            Slider {
+                width: sliderWidth
+                from: 0
+                to: 100
+                value: 20
+                stepSize: 20
+
+                property int qqc2_style_tickPosition: 1
+            }
+
+            Slider {
+                width: sliderWidth
+                from: 0
+                to: 100
+                stepSize: 5
+                value: 65
+
+                property int qqc2_style_tickPosition: 2
+            }
+        }
+
+        Row {
+            spacing: 20
+
+            Slider {
+                height: sliderHeight
+                orientation: Qt.Vertical
+                from: 0
+                to: 10
+                value: 5
+            }
+
+            Slider {
+                height: sliderHeight
+                orientation: Qt.Vertical
+                from: 0
+                to: 10
+                value: 5
+                enabled: false
+            }
+
+            Slider {
+                height: sliderHeight
+                orientation: Qt.Vertical
+                from: 0
+                to: 100
+                value: 20
+                stepSize: 20
+
+                property int qqc2_style_tickPosition: 1
+            }
+
+            Slider {
+                height: sliderHeight
+                orientation: Qt.Vertical
+                from: 0
+                to: 100
+                stepSize: 5
+                value: 65
+
+                property int qqc2_style_tickPosition: 2
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From 7e54b75b8660c794d5e5ed5e252b4a87fa105c2b Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Date: Thu, 27 Aug 2020 17:36:45 +0200
Subject: Native style: remove versioning from imports

Change-Id: I73319d18ca6540227ce6bf4bdcf217a3c279c64c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/manual/nativestyle/Sliders.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/manual/nativestyle/Sliders.qml')

diff --git a/tests/manual/nativestyle/Sliders.qml b/tests/manual/nativestyle/Sliders.qml
index dba0794b..dcc6c79c 100644
--- a/tests/manual/nativestyle/Sliders.qml
+++ b/tests/manual/nativestyle/Sliders.qml
@@ -34,9 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 ControlContainer {
     id: container
-- 
cgit v1.2.3