meta-qt5: update meta layer

- Update submodules to first 5.9.5 branch snapshot
- mysql_config path fix
- Update Qt SRC_URI from github.com to code.qt.io

Adjust meta-boot2qt recipes accordingly due Qt
source mirror change.

Task-number: QTBUG-66252
Change-Id: Ide5542c7d3439fc4ce72e053bbbb63b1a36d7365
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

12 files changed, 26 insertions, 105 deletions

diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb
index 51369cf1..c81adeed 100644
--- a/recipes-qt/automotive/multiscreen-demo_git.bb
+++ b/recipes-qt/automotive/multiscreen-demo_git.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c
 inherit qt5-module systemd
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://code.qt.io/qt-apps"
+QT_GIT_PROJECT = "qt-apps"
 QT_MODULE_BRANCH = "master"
 
 SRC_URI += "\
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index d656aeff..5fc39658 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -35,7 +35,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82"
 inherit qt5-module systemd
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://code.qt.io/qt-apps"
+QT_GIT_PROJECT = "qt-apps"
 
 SRC_URI += " \
     file://neptune.service \
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb
index 4bf7ef8c..54f11887 100644
--- a/recipes-qt/automotive/qmllive-target_git.bb
+++ b/recipes-qt/automotive/qmllive-target_git.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.
@@ -35,8 +35,8 @@ LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://github.com/qtproject"
-QT_MODULE = "qt-apps-qmllive"
+QT_GIT_PROJECT = "qt-apps"
+QT_MODULE = "qmllive"
 QT_MODULE_BRANCH = "master"
 
 SRC_URI += " \
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
index 25e28df5..9cc0d37b 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/recipes-qt/automotive/qtwebbrowser_git.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,8 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://github.com/qtproject"
-QT_MODULE = "qt-apps-qtwebbrowser"
+QT_GIT_PROJECT = "qt-apps"
 QT_MODULE_BRANCH = "dev"
 
 SRCREV = "023733af5523a5ad84359926224fa106001215f4"
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index f133352d..b816a11e 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.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.
@@ -33,18 +33,18 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4
 
 inherit qmake5
 
-QT_PROJECT_GIT = "git://github.com/qtproject"
+QT_GIT_PROJECT = ""
 
 SRC_URI = " \
-    ${QT_PROJECT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \
-    ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
-    ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
-    ${QT_PROJECT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
+    ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \
+    ${QT_GIT}qt/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
+    ${QT_GIT}qt/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
+    ${QT_GIT}qt-apps/qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
     "
 
-PV = "5.7+git${SRCPV}"
+PV = "5.9.5+git${SRCPV}"
 
 BRANCH = "5.7"
 BROWSER_BRANCH = "dev"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 32f569b2..0a0a21f8 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.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,8 +34,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://github.com/qtproject"
-QT_MODULE = "qt-apps-boot2qt-launcher"
+QT_GIT_PROJECT = "qt-apps"
+QT_MODULE = "boot2qt-launcher"
 
 SRC_URI += " \
     file://b2qt-startup.sh \
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index 8834e19f..3d9a196e 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.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,8 +34,8 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginli
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://github.com/qtproject"
-QT_MODULE = "qt-apps-boot2qt-demos"
+QT_GIT_PROJECT = "qt-apps"
+QT_MODULE = "boot2qt-demos"
 
 SRCREV = "b9585b440819e1444b20f30435f81c46801158c5"
 
diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb
index 3a9a002a..c98e6828 100644
--- a/recipes-qt/b2qt-addons/qdbd.bb
+++ b/recipes-qt/b2qt-addons/qdbd.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.
@@ -36,9 +36,9 @@ inherit distro_features_check
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
-QT_GIT = "git://github.com/qtproject"
-QT_MODULE = "qt-apps-qdb"
-QT_MODULE_BRANCH = "5.8"
+QT_GIT_PROJECT = "qt-apps"
+QT_MODULE = "qdb"
+QT_MODULE_BRANCH = "5.9"
 
 SRC_URI += "file://b2qt-gadget-network.sh \
            file://defaults \
diff --git a/recipes-qt/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb
index ee7623c3..495598a4 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 920273e1..00000000
--- 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 b546098a..00000000
--- 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 \
-    "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 48329fe7..96bcf7f5 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,7 +24,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="a96836aedf30d2e26fbcafc13b1313d1325a0730"
+           revision="144a388b5f8d6f76858469a160714a0cec811ecb"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"