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, 11 insertions, 73 deletions

diff --git a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/Data.qml b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/Data.qml
index ed9913b3..75fcee6a 100644
--- a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/Data.qml
+++ b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/Data.qml
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+import QtQuick
 
 Item {
     property alias model: dataModel
diff --git a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/NewButton.qml b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/NewButton.qml
deleted file mode 100644
index 19309cca..00000000
--- a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/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/qmlspectrogram/qml/qmlspectrogram/main.qml b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
index 23eb8312..66de168c 100644
--- a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
+++ b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
@@ -27,10 +27,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
-import QtQuick.Layouts 1.0
-import QtQuick.Window 2.1
-import QtDataVisualization 1.2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Window
+import QtDataVisualization
 import "."
 
 Window {
@@ -171,7 +172,7 @@ Window {
         opacity: 0.5
 
         //! [3]
-        NewButton {
+        Button {
             id: polarToggle
             Layout.fillWidth: true
             Layout.fillHeight: true
@@ -188,7 +189,7 @@ Window {
         }
         //! [3]
 
-        NewButton {
+        Button {
             id: orthoToggle
             Layout.fillWidth: true
             Layout.fillHeight: true
@@ -214,7 +215,7 @@ Window {
             }
         }
 
-        NewButton {
+        Button {
             id: flipGridToggle
             Layout.fillWidth: true
             Layout.fillHeight: true
@@ -230,7 +231,7 @@ Window {
             }
         }
 
-        NewButton {
+        Button {
             id: labelOffsetToggle
             Layout.fillWidth: true
             Layout.fillHeight: true
@@ -245,7 +246,7 @@ Window {
             }
         }
 
-        NewButton {
+        Button {
             id: surfaceGridToggle
             Layout.fillWidth: true
             Layout.fillHeight: true