aboutsummaryrefslogtreecommitdiffstats
path: root/src/extras
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-03-18 15:40:52 +0100
committerJari-Pekka Nurmi <jpnurmi@theqtcompany.com>2015-03-23 17:23:15 +0200
commit28a38f2b17c10fd3f62e769607e0ebbc73bfc8d4 (patch)
tree74a857cc8c9b022f99028edd75c5276fd850092d /src/extras
parent86c80a68567a7019c151f830155fe0ac1560e03e (diff)
Remove SplitView
SplitView is a very centric control. It won't be provided in Qt Quick Controls 2.0, but maybe later when desktop support is re-considered. Qt Quick Controls 2.0 will focus on embedded and mobile. SplitView is still available in 1.x Change-Id: I3bc1c7a525d4e1e75153205ca806dc4dcee7e601 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/extras')
-rw-r--r--src/extras/extras.pri6
-rw-r--r--src/extras/qquickabstractsplitview.cpp97
-rw-r--r--src/extras/qquickabstractsplitview_p.h90
3 files changed, 2 insertions, 191 deletions
diff --git a/src/extras/extras.pri b/src/extras/extras.pri
index 6b97f98c..6d82cdd0 100644
--- a/src/extras/extras.pri
+++ b/src/extras/extras.pri
@@ -1,9 +1,7 @@
INCLUDEPATH += $$PWD
HEADERS += \
- $$PWD/qquickabstractdrawer_p.h \
- $$PWD/qquickabstractsplitview_p.h
+ $$PWD/qquickabstractdrawer_p.h
SOURCES += \
- $$PWD/qquickabstractdrawer.cpp \
- $$PWD/qquickabstractsplitview.cpp
+ $$PWD/qquickabstractdrawer.cpp
diff --git a/src/extras/qquickabstractsplitview.cpp b/src/extras/qquickabstractsplitview.cpp
deleted file mode 100644
index cf20945e..00000000
--- a/src/extras/qquickabstractsplitview.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Extras 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$
-**
-****************************************************************************/
-
-#include "qquickabstractsplitview_p.h"
-
-#include <QtQuickControls/private/qquickabstractcontainer_p_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QQuickAbstractSplitViewPrivate : public QQuickAbstractContainerPrivate
-{
-public:
- QQuickAbstractSplitViewPrivate() : orientation(Qt::Horizontal) { }
-
- bool resizing;
- Qt::Orientation orientation;
-};
-
-QQuickAbstractSplitView::QQuickAbstractSplitView(QQuickItem *parent) :
- QQuickAbstractContainer(*(new QQuickAbstractSplitViewPrivate), parent)
-{
-}
-
-Qt::Orientation QQuickAbstractSplitView::orientation() const
-{
- Q_D(const QQuickAbstractSplitView);
- return d->orientation;
-}
-
-void QQuickAbstractSplitView::setOrientation(Qt::Orientation orientation)
-{
- Q_D(QQuickAbstractSplitView);
- if (d->orientation != orientation) {
- d->orientation = orientation;
- emit orientationChanged();
- }
-}
-
-bool QQuickAbstractSplitView::isResizing() const
-{
- Q_D(const QQuickAbstractSplitView);
- return d->resizing;
-}
-
-void QQuickAbstractSplitView::setResizing(bool resizing)
-{
- Q_D(QQuickAbstractSplitView);
- if (d->resizing != resizing) {
- d->resizing = resizing;
- emit resizingChanged();
- }
-}
-
-void QQuickAbstractSplitView::addItem(QQuickItem *item)
-{
- // TODO
- Q_UNUSED(item);
-}
-
-void QQuickAbstractSplitView::componentComplete()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/extras/qquickabstractsplitview_p.h b/src/extras/qquickabstractsplitview_p.h
deleted file mode 100644
index 09d511fc..00000000
--- a/src/extras/qquickabstractsplitview_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Extras 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$
-**
-****************************************************************************/
-
-#ifndef QQUICKABSTRACTSPLITVIEW_P_H
-#define QQUICKABSTRACTSPLITVIEW_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQuickExtras/private/qtquickextrasglobal_p.h>
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QQuickAbstractSplitViewPrivate;
-
-class Q_QUICKEXTRAS_EXPORT QQuickAbstractSplitView : public QQuickAbstractContainer
-{
- Q_OBJECT
- Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL)
- Q_PROPERTY(bool resizing READ isResizing NOTIFY resizingChanged FINAL)
-
-public:
- explicit QQuickAbstractSplitView(QQuickItem *parent = Q_NULLPTR);
-
- Qt::Orientation orientation() const;
- void setOrientation(Qt::Orientation orientation);
-
- bool isResizing() const;
- void setResizing(bool resizing);
-
-public Q_SLOTS:
- void addItem(QQuickItem *item);
-
-Q_SIGNALS:
- void orientationChanged();
- void resizingChanged();
-
-protected:
- void componentComplete() Q_DECL_OVERRIDE;
-
-private:
- Q_DISABLE_COPY(QQuickAbstractSplitView)
- Q_DECLARE_PRIVATE(QQuickAbstractSplitView)
-};
-
-QT_END_NAMESPACE
-
-#endif // QQUICKABSTRACTSPLITVIEW_P_H