3 files changed, 1 insertions, 79 deletions

diff --git a/recipes-qt/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb
index ee7623c..495598a 100644
--- a/recipes-qt/qt5/qtotaupdate.bb
+++ b/recipes-qt/qt5/qtotaupdate.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -34,7 +34,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://github.com/qt"
 QT_MODULE_BRANCH = "master"
 
 SRCREV = "9a7eef1fec80e732451d501a658df9f8058a404d"
diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch
deleted file mode 100644
index 920273e..0000000
--- a/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 83046de497827a69bf05cd0b06ca6421b51e02b8 Mon Sep 17 00:00:00 2001
-From: J-P Nurmi <jpnurmi@qt.io>
-Date: Mon, 22 Jan 2018 10:58:06 +0100
-Subject: [PATCH] Control: fix background size regression caused by deferred
- execution
-
-Task-number: QTBUG-65880
-Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e
-Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
----
- src/quicktemplates2/qquickcontrol.cpp  | 1 +
- tests/auto/controls/data/tst_popup.qml | 8 ++++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
-index 6fbd4c07..957936df 100644
---- a/src/quicktemplates2/qquickcontrol.cpp
-+++ b/src/quicktemplates2/qquickcontrol.cpp
-@@ -1343,6 +1343,7 @@ void QQuickControl::componentComplete()
-     d->executeBackground(true);
-     d->executeContentItem(true);
-     QQuickItem::componentComplete();
-+    d->resizeBackground();
-     d->resizeContent();
-     if (!d->hasLocale)
-         d->locale = QQuickControlPrivate::calcLocale(d->parentItem);
-diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
-index bec50ad0..1f3a097f 100644
---- a/tests/auto/controls/data/tst_popup.qml
-+++ b/tests/auto/controls/data/tst_popup.qml
-@@ -1253,4 +1253,12 @@ TestCase {
-         control.open()
-         verify(control.visible)
-     }
-+
-+    function test_deferredBackgroundSize() {
-+        var control = createTemporaryObject(popupControl, testCase, {width: 200, height: 100})
-+        verify(control)
-+
-+        compare(control.background.width, 200)
-+        compare(control.background.height, 100)
-+    }
- }
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
deleted file mode 100644
index b546098..0000000
--- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend
+++ /dev/null
@@ -1,34 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $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$
-##
-############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-    file://0001-Control-fix-background-size-regression-caused-by-def.patch \
-    "