EmbeddedInWidgets example: Use QQC2 components

Replaces the TextBox custom component with a qt quick controls 2
TextField.

Task-number: QTBUG-95735
Change-Id: Ic1fb47c8e57cd2d805d4a9941df9bc02a5e7bc17
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 409019bc1185b605a6a3e1f1ab474117d5ce0055)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

6 files changed, 11 insertions, 106 deletions

diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt
index a7afac6184..c1cb79e027 100644
--- a/examples/quick/embeddedinwidgets/CMakeLists.txt
+++ b/examples/quick/embeddedinwidgets/CMakeLists.txt
@@ -38,7 +38,6 @@ target_link_libraries(embeddedinwidgets PUBLIC
 
 # Resources:
 set(embeddedinwidgets_resource_files
-    "TextBox.qml"
     "main.qml"
 )
 
diff --git a/examples/quick/embeddedinwidgets/TextBox.qml b/examples/quick/embeddedinwidgets/TextBox.qml
deleted file mode 100644
index b45bb0ef1b..0000000000
--- a/examples/quick/embeddedinwidgets/TextBox.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-FocusScope {
-    id: root
-
-    width: 100
-    height: 30
-
-    property Item nextInFocus;
-    property string label;
-
-    Rectangle {
-        anchors.margins: 2
-        anchors.fill: parent
-        radius: 8
-        gradient: Gradient {
-            GradientStop { position: 0; color: "lightgray" }
-            GradientStop { position: 1; color: "white" }
-        }
-        border.color: "white"
-        border.width: 2
-        antialiasing: true
-
-        TextInput {
-            anchors.fill: parent
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            focus: true
-
-            text: root.label;
-
-            KeyNavigation.tab: root.nextInFocus;
-        }
-    }
-}
diff --git a/examples/quick/embeddedinwidgets/embeddedinwidgets.pro b/examples/quick/embeddedinwidgets/embeddedinwidgets.pro
index de47a397ab..936da9dfeb 100644
--- a/examples/quick/embeddedinwidgets/embeddedinwidgets.pro
+++ b/examples/quick/embeddedinwidgets/embeddedinwidgets.pro
@@ -3,7 +3,7 @@ QT += widgets quick
 
 SOURCES += main.cpp
 
-OTHER_FILES += main.qml TextBox.qml
+OTHER_FILES += main.qml
 
 RESOURCES += \
     embeddedinwidgets.qrc
diff --git a/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc b/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
index 0154393a8d..9fc33601d0 100644
--- a/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
+++ b/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/embeddedinwidgets">
         <file>main.qml</file>
-        <file>TextBox.qml</file>
         <file>reflect.frag.qsb</file>
     </qresource>
 </RCC>
diff --git a/examples/quick/embeddedinwidgets/main.cpp b/examples/quick/embeddedinwidgets/main.cpp
index 91147772ba..e7687c9fec 100644
--- a/examples/quick/embeddedinwidgets/main.cpp
+++ b/examples/quick/embeddedinwidgets/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/quick/embeddedinwidgets/main.qml b/examples/quick/embeddedinwidgets/main.qml
index 7ce3bb8355..fea6118f90 100644
--- a/examples/quick/embeddedinwidgets/main.qml
+++ b/examples/quick/embeddedinwidgets/main.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
@@ -48,7 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
+import QtQuick.Controls
 
 Rectangle {
     id: window
@@ -63,31 +64,22 @@ Rectangle {
 
     Column {
         id: column
-        opacity: 0.99 // work around QTBUG-29037
 
         y: 50
         width: 200
         anchors.horizontalCenter: parent.horizontalCenter
+        spacing: 4
 
-        TextBox {
-            id: input1
+
+        TextField {
+            text: "A QML text field..."
             width: parent.width
-            height: 30
             focus: true
-
-            label: "A QML text box.."
-
-            nextInFocus: input2;
         }
 
-        TextBox {
-            id: input2
+        TextField {
+            text: "Another QML text field..."
             width: parent.width
-            height: 30
-
-            label: "Another QML text box.."
-
-            nextInFocus: input1;
         }
 
         layer.enabled: true