From d2439bede98e0f1eb42e8c44b997b1e5d29454e4 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Tue, 4 Nov 2014 17:43:49 +0100
Subject: [PATCH] Remove the SplitView example
This example served no purpose. A similar snippet can
be found in SplitView docs, in the detailed description.
Change-Id: Ic53e5bbe8c0c46c7cf9a0002f12ad6c229028388
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
---
.gitignore | 1 -
examples/quick/controls/controls.pro | 1 -
examples/quick/controls/splitview/main.qml | 82 ------------------
.../quick/controls/splitview/resources.qrc | 5 --
.../quick/controls/splitview/splitview.pro | 12 ---
.../controls/splitview/splitview.qmlproject | 16 ----
.../quick/controls/splitview/src/main.cpp | 49 -----------
examples/quick/controls/splitview/src/src.pri | 2 -
.../qtquickcontrols-example-splitview.png | Bin 398 -> 0 bytes
.../doc/src/qtquickcontrols-examples.qdoc | 14 ---
10 files changed, 182 deletions(-)
delete mode 100644 examples/quick/controls/splitview/main.qml
delete mode 100644 examples/quick/controls/splitview/resources.qrc
delete mode 100644 examples/quick/controls/splitview/splitview.pro
delete mode 100644 examples/quick/controls/splitview/splitview.qmlproject
delete mode 100644 examples/quick/controls/splitview/src/main.cpp
delete mode 100644 examples/quick/controls/splitview/src/src.pri
delete mode 100644 src/controls/doc/images/qtquickcontrols-example-splitview.png
diff --git a/.gitignore b/.gitignore
index 86a342d16..7c2ec2739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
/examples/quick/controls/basiclayouts/basiclayouts
/examples/quick/controls/calendar/calendar
/examples/quick/controls/gallery/gallery
-/examples/quick/controls/splitview/splitview
/examples/quick/controls/styles/styles
/examples/quick/controls/tableview/tableview
/examples/quick/controls/touch/touch
diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro
index 134a25e35..f6696bc53 100644
--- a/examples/quick/controls/controls.pro
+++ b/examples/quick/controls/controls.pro
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
SUBDIRS += \
gallery \
- splitview \
tableview \
touch \
basiclayouts \
diff --git a/examples/quick/controls/splitview/main.qml b/examples/quick/controls/splitview/main.qml
deleted file mode 100644
index 8707b6cc8..000000000
--- a/examples/quick/controls/splitview/main.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-
-
-
-import QtQuick 2.2
-import QtQuick.Controls 1.2
-import QtQuick.Layouts 1.0
-
-ApplicationWindow {
- visible: true
- width: 600
- height: 400
-
- SplitView {
- anchors.fill: parent
-
- Rectangle {
- id: column
- width: 200
- Layout.minimumWidth: 100
- Layout.maximumWidth: 300
- color: "lightsteelblue"
- }
-
- SplitView {
- orientation: Qt.Vertical
- Layout.fillWidth: true
-
- Rectangle {
- id: row1
- height: 200
- color: "lightblue"
- Layout.minimumHeight: 1
- }
-
- Rectangle {
- id: row2
- color: "lightgray"
- }
- }
- }
-}
diff --git a/examples/quick/controls/splitview/resources.qrc b/examples/quick/controls/splitview/resources.qrc
deleted file mode 100644
index 3b111a907..000000000
--- a/examples/quick/controls/splitview/resources.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/">
- <file>main.qml</file>
-</qresource>
-</RCC>
diff --git a/examples/quick/controls/splitview/splitview.pro b/examples/quick/controls/splitview/splitview.pro
deleted file mode 100644
index 40adf3d11..000000000
--- a/examples/quick/controls/splitview/splitview.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-QT += qml quick
-TARGET = splitview
-!no_desktop: QT += widgets
-
-include(src/src.pri)
-include(../shared/shared.pri)
-
-OTHER_FILES += \
- main.qml
-
-RESOURCES += \
- resources.qrc
diff --git a/examples/quick/controls/splitview/splitview.qmlproject b/examples/quick/controls/splitview/splitview.qmlproject
deleted file mode 100644
index e5a8bf02c..000000000
--- a/examples/quick/controls/splitview/splitview.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.1
-
-Project {
- mainFile: "main.qml"
-
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
-}
diff --git a/examples/quick/controls/splitview/src/main.cpp b/examples/quick/controls/splitview/src/main.cpp
deleted file mode 100644
index a757f4853..000000000
--- a/examples/quick/controls/splitview/src/main.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtquickcontrolsapplication.h"
-#include <QtQml/QQmlApplicationEngine>
-
-int main(int argc, char *argv[])
-{
- QtQuickControlsApplication app(argc, argv);
- QQmlApplicationEngine engine(QUrl("qrc:/main.qml"));
- return app.exec();
-}
diff --git a/examples/quick/controls/splitview/src/src.pri b/examples/quick/controls/splitview/src/src.pri
deleted file mode 100644
index 66d903eac..000000000
--- a/examples/quick/controls/splitview/src/src.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES += \
- $$PWD/main.cpp
diff --git a/src/controls/doc/images/qtquickcontrols-example-splitview.png b/src/controls/doc/images/qtquickcontrols-example-splitview.png
deleted file mode 100644
index a82017b49b52f615a1d8177564ac3551fb7e7a01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^(||aIg9%8!wv1a2q!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(7Bet#3xhBt!>l<HKtc8rPhVH|yR6LY++6$o7taTp!sqGY7*cWT
z?e)8yhYUm-E-uM*ebL<1@jL&4z`2J^`+g)iuJN6-P~WWav#-FrlW+a^+<UihTax*H
zxx*E!-bT#-<n!D+_wuVIDSkyKMG>bKCyf@TjsT9<01iQ}g#uh)K}8p!phgQwuvGvk
zxKKbz1YPl}g;mNCv6>vSw|2+A6FM~QzSZgN^Y3%qjy-5`?sDNNRfU|Z25*9G-UOw3
zcNE;6Y|@%2E@1Xob5`-ncX5p$v-Oc|-KG+=N%4kLuJ;UuTj<u{chleP^6Y-<5%=6%
R)PaG;;OXk;vd$@?2>`E*iaY=S
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc
index 8b8c14699..ca293df0e 100644
--- a/src/controls/doc/src/qtquickcontrols-examples.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc
@@ -62,20 +62,6 @@
\include examples-run.qdocinc
*/
-/*!
- \example splitview
- \title Qt Quick Controls - Split View Example
- \ingroup qtquickcontrols_examples
- \brief An example for the SplitView UI control.
- \image qtquickcontrols-example-splitview.png
-
- This example project demonstrates the usage of \l {SplitView} from
- \l{Qt Quick Controls} - a control that lays out items horizontally or
- vertically with a draggable splitter between each item.
-
- \include examples-run.qdocinc
-*/
-
/*!
\example tableview
\title Qt Quick Controls - Table View Example
--
GitLab