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>

3 files changed, 6 insertions, 61 deletions

diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/NewButton.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/NewButton.qml
deleted file mode 100644
index 3529f56f..00000000
--- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/NewButton.qml
+++ /dev/null
@@ -1,55 +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
-
-Item {
-    id: newbutton
-
-    property alias text: buttonText.text
-
-    signal clicked
-
-    height: 80
-
-    Button {
-        opacity: 0.5
-        width: parent.width
-        height: parent.height
-        Text {
-            id: buttonText
-            wrapMode: Text.WordWrap
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            anchors.fill: parent
-        }
-        onClicked: newbutton.clicked()
-    }
-}
diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
index 764987b0..c12c40e4 100644
--- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
+++ b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
@@ -27,8 +27,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
-import QtDataVisualization 1.1
+import QtQuick
+import QtDataVisualization
+import QtQuick.Controls
 import "."
 
 Item {
@@ -270,7 +271,7 @@ Item {
     }
     //! [7]
 
-    NewButton {
+    Button {
         id: rangeToggle
         width: parent.width / 3 // We're adding 3 buttons and want to divide them equally
         text: "Use Preset Range"
@@ -299,7 +300,7 @@ Item {
     }
 
     //! [8]
-    NewButton {
+    Button {
         id: orthoToggle
         width: parent.width / 3
         text: "Display Orthographic"
@@ -318,7 +319,7 @@ Item {
     }
     //! [8]
 
-    NewButton {
+    Button {
         id: exitButton
         width: parent.width / 3
         text: "Quit"
diff --git a/examples/datavisualization/qmlaxisdrag/qmlaxisdrag.qrc b/examples/datavisualization/qmlaxisdrag/qmlaxisdrag.qrc
index c6c45e26..9e6b90c8 100644
--- a/examples/datavisualization/qmlaxisdrag/qmlaxisdrag.qrc
+++ b/examples/datavisualization/qmlaxisdrag/qmlaxisdrag.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>qml/qmlaxisdrag/main.qml</file>
-        <file>qml/qmlaxisdrag/NewButton.qml</file>
     </qresource>
     <qresource prefix="/mesh">
         <file alias="cube">qml/qmlaxisdrag/cube.obj</file>