diff options
Diffstat (limited to 'examples/datavisualization/qmlscatter')
5 files changed, 12 insertions, 76 deletions
diff --git a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc index 9d13f0bb..667aea49 100644 --- a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc +++ b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc @@ -59,7 +59,6 @@ <qresource prefix="/"> <file>qml/qmlscatter/Data.qml</file> <file>qml/qmlscatter/main.qml</file> - <file>qml/qmlscatter/NewButton.qml</file> </qresource> </RCC> \endcode @@ -79,7 +78,7 @@ \snippet qmlscatter/qml/qmlscatter/main.qml 0 The last \c import just imports all the qml files in the same directory as our \c {main.qml}, - because that's where \c NewButton.qml and \c Data.qml are. + because that's where \c Data.qml is. Then we create our main \c Rectangle and call it \c mainView: diff --git a/examples/datavisualization/qmlscatter/qml/qmlscatter/Data.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/Data.qml index e077669f..26bfe3ef 100644 --- a/examples/datavisualization/qmlscatter/qml/qmlscatter/Data.qml +++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/Data.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick Item { //! [1] diff --git a/examples/datavisualization/qmlscatter/qml/qmlscatter/NewButton.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/NewButton.qml deleted file mode 100644 index 19309cca..00000000 --- a/examples/datavisualization/qmlscatter/qml/qmlscatter/NewButton.qml +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.1 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 - -Item { - id: newbutton - - property alias text: buttonText.text - - signal clicked - - implicitWidth: buttonText.implicitWidth + 5 - implicitHeight: buttonText.implicitHeight + 10 - - Button { - id: buttonText - width: parent.width - height: parent.height - - style: ButtonStyle { - label: Component { - Text { - text: buttonText.text - clip: true - wrapMode: Text.WordWrap - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - anchors.fill: parent - } - } - } - onClicked: newbutton.clicked() - } -} diff --git a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml index 002f9d93..6e54fc96 100644 --- a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml @@ -28,9 +28,10 @@ ****************************************************************************/ //! [0] -import QtQuick 2.1 -import QtQuick.Layouts 1.0 -import QtDataVisualization 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtDataVisualization import "." //! [0] @@ -148,7 +149,7 @@ Rectangle { anchors.left: parent.left spacing: 0 //! [7] - NewButton { + Button { id: shadowToggle Layout.fillHeight: true Layout.fillWidth: true @@ -166,7 +167,7 @@ Rectangle { } //! [7] - NewButton { + Button { id: smoothToggle Layout.fillHeight: true Layout.fillWidth: true @@ -182,7 +183,7 @@ Rectangle { } } - NewButton { + Button { id: cameraToggle Layout.fillHeight: true Layout.fillWidth: true @@ -197,7 +198,7 @@ Rectangle { } } - NewButton { + Button { id: themeToggle Layout.fillHeight: true Layout.fillWidth: true @@ -216,7 +217,7 @@ Rectangle { } } - NewButton { + Button { id: backgroundToggle Layout.fillHeight: true Layout.fillWidth: true @@ -232,7 +233,7 @@ Rectangle { } } - NewButton { + Button { id: exitButton Layout.fillHeight: true Layout.fillWidth: true diff --git a/examples/datavisualization/qmlscatter/qmlscatter.qrc b/examples/datavisualization/qmlscatter/qmlscatter.qrc index 225d78b0..f36c81c5 100644 --- a/examples/datavisualization/qmlscatter/qmlscatter.qrc +++ b/examples/datavisualization/qmlscatter/qmlscatter.qrc @@ -2,6 +2,5 @@ <qresource prefix="/"> <file>qml/qmlscatter/Data.qml</file> <file>qml/qmlscatter/main.qml</file> - <file>qml/qmlscatter/NewButton.qml</file> </qresource> </RCC> |