diff options
author | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-14 10:49:40 +0200 |
---|---|---|
committer | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-27 10:01:58 +0200 |
commit | 6c2aec18ed7f043c17b09c939b9bc521def37aa5 (patch) | |
tree | 3dd4face677a6eb9ef2e45b51548d4b5a17263c4 /examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml | |
parent | 1fc39261132f0b3edf89934fd055234f8b19ced1 (diff) |
Fix most of the QML example applications
Most of the QML examples work now as supposed to. Qmlbars still needs
fixing and is not included in this patch.
Task-number: QTBUG-89298
Change-Id: Ic8bc6511cdb00dd3db0a181b7a31b3bbc39f0556
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml')
-rw-r--r-- | examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml index 8a0802cb..107e2f75 100644 --- a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml @@ -27,9 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Layouts 1.0 -import QtDataVisualization 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtDataVisualization import "." Rectangle { @@ -135,7 +136,7 @@ Rectangle { anchors.right: parent.right opacity: 0.5 - NewButton { + Button { id: surfaceGridToggle Layout.fillWidth: true Layout.fillHeight: true @@ -153,7 +154,7 @@ Rectangle { //! [1] } - NewButton { + Button { id: surfaceToggle Layout.fillWidth: true Layout.fillHeight: true @@ -171,7 +172,7 @@ Rectangle { //! [8] } - NewButton { + Button { id: flatShadingToggle Layout.fillWidth: true Layout.fillHeight: true @@ -192,7 +193,7 @@ Rectangle { //! [2] } - NewButton { + Button { id: backgroundToggle Layout.fillWidth: true Layout.fillHeight: true @@ -208,7 +209,7 @@ Rectangle { } } - NewButton { + Button { id: gridToggle Layout.fillWidth: true Layout.fillHeight: true @@ -224,7 +225,7 @@ Rectangle { } } - NewButton { + Button { id: seriesToggle Layout.fillWidth: true Layout.fillHeight: true |