Merge remote-tracking branch 'origin/pyro-5.11' into pyro

* origin/pyro-5.11:
  qt5: Upgrade to Qt 5.11.0

Change-Id: Ida14b8ede25b65ea7e60dc1a6555d7c93523bbbf

15 files changed, 15 insertions, 254 deletions

diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 3a1bcbe..f54887c 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -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.
@@ -27,27 +27,4 @@
 ##
 ############################################################################
 
-python __anonymous() {
-    if d.getVar('DISABLE_QTQUICKCOMPILER', True) == "1":
-        return
-
-    provider = ""
-    sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
-    pn = d.getVar("PN", True)
-
-    if d.getVar('ENABLE_QTQUICKCOMPILER', True) == "1":
-        provider = "qtquickcompiler"
-    elif os.path.isdir(sdk_path):
-        provider = "qtquickcompiler-sdk"
-    else:
-        bb.note("qtquickcompiler not enabled for %s" % pn)
-        return
-
-    if "toolchain-host" in pn:
-        d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider)
-    if "toolchain-target" in pn:
-        d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider)
-    else:
-        d.appendVar('DEPENDS', " %s %s-native" % (provider, provider))
-        d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler")
-}
+EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler"
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 08efdf1..1aa4bd5 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -76,8 +76,6 @@ OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
 # Disable SHA validation for branch
 QT_MODULE_BRANCH_PARAM = "nobranch=1"
 
-PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
-
 IMAGE_FSTYPES = "conf"
 IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 166ae94..ae60ef4 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -281,9 +281,6 @@ CONF_VERSION = "1"
 INHERIT += "image-buildinfo"
 INHERIT += "internal-build"
 
-# Enables use of QtQuickCompiler if you have access to the gerrit project
-#ENABLE_QTQUICKCOMPILER = "1"
-
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
 
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
index acae372..0acd0a7 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
@@ -31,7 +31,7 @@ DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
-inherit nativesdk packagegroup qtquickcompiler
+inherit nativesdk packagegroup
 
 RDEPENDS_${PN} += "\
     nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host \
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index c3f07b8..3ce2e79 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
@@ -31,7 +31,7 @@ DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
-inherit nativesdk packagegroup qtquickcompiler
+inherit nativesdk packagegroup
 
 python __anonymous() {
     overrides = d.getVar("OVERRIDES", True).split(":")
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 7a22951..2af00da 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -31,7 +31,7 @@ DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
-inherit packagegroup qtquickcompiler
+inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
deleted file mode 100644
index 1fad9f3..0000000
--- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-DESCRIPTION = "Qt Quick Compiler using prebuilt binaries from Qt SDK"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-
-inherit allarch qmake5_paths
-
-do_unpack[depends] += "p7zip-native:do_populate_sysroot"
-
-SRC_URI = "http://download.qt.io/development_releases/prebuilt/mingw_32/i686-4.9.2-release-posix-dwarf-rt_v3-rev1-runtime.7z"
-
-SRC_URI[md5sum] = "a7d673c4ad8bcef9e464ea5386492cb3"
-SRC_URI[sha256sum] = "f7e58b0fb1f5aa4c23eefdc60abb88cb642eaa272fb741dca23068c70ca86542"
-
-S = "${WORKDIR}"
-
-NATIVESDK_BINARY = "qtquickcompiler"
-NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe"
-
-do_install() {
-    install -d ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features
-    install -m 0755 ${THISDIR}/qtquickcompiler-sdk/mkspecs/features/qtquickcompiler.prf ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features
-    install -d ${D}${OE_QMAKE_PATH_ARCHDATA}/cmake/Qt5QuickCompiler
-    install -m 0644 ${THISDIR}/qtquickcompiler-sdk/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake ${D}${OE_QMAKE_PATH_ARCHDATA}/cmake/Qt5QuickCompiler
-
-    if [ "${PN}" = "qtquickcompiler-sdk-native" ]; then
-        install -d ${D}${OE_QMAKE_PATH_BINS}
-        install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/qtquickcompiler ${D}${OE_QMAKE_PATH_BINS}
-    elif [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then
-        install -d ${D}${OE_QMAKE_PATH_BINS}
-        install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/${NATIVESDK_BINARY} ${D}${OE_QMAKE_PATH_BINS}
-    fi
-
-    # Use the EffectivePath instead of installation path
-    sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf
-}
-
-do_install_append_mingw32() {
-    if [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then
-        install -m 0644 ${WORKDIR}/libgcc_s_dw2-1.dll ${D}${OE_QMAKE_PATH_BINS}
-    fi
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-ALLOW_EMPTY_${PN} = "1"
-PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools = "${OE_QMAKE_PATH_BINS}"
-FILES_${PN}-dev = "${OE_QMAKE_PATH_ARCHDATA}"
-INSANE_SKIP_${PN} += "already-stripped"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 7685c5a..e7c7adf 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -43,7 +43,6 @@ PACKAGECONFIG += " \
     icu \
     libinput \
     linuxfb \
-    qml-debug \
     sql-sqlite \
     tslib \
     xkbcommon-evdev \
diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index 8297a74..e33664b 100644
--- a/recipes-qt/qt5/qtcharts_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -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.
@@ -27,4 +27,8 @@
 ##
 ############################################################################
 
-inherit qtquickcompiler
+PACKAGECONFIG += "qml-debug"
+
+FILES_${PN}-plugins_mingw32 = " \
+    ${OE_QMAKE_PATH_PLUGINS}/*/*.dll \
+"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
deleted file mode 100644
index 379d31a..0000000
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 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$
-##
-############################################################################
-
-DESCRIPTION = "Qt Quick Compiler"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=02f6307ab0d6c4bd38a1540f16ea705d;beginline=1;endline=17"
-
-inherit qt5-module
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
-    "
-
-SRCREV = "8c48d57b2143a89fff4438a313e1640d9b97dcc8"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "qtbase qtdeclarative"
-
-do_install_append() {
-    # Use the EffectivePath instead of installation path
-    sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
index b7368ff..4f48099 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
@@ -27,7 +27,5 @@
 ##
 ############################################################################
 
-inherit qtquickcompiler
-
-PACKAGECONFIG = "lipi-toolkit lang-all hunspell"
+PACKAGECONFIG_append = " hunspell"
 RDEPENDS_${PN} += "hunspell-dicts"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch b/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch
deleted file mode 100644
index 2af19e8..0000000
--- a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 4903971e1e4b58f03b0f636a1ab494bfbc5d76d4 Mon Sep 17 00:00:00 2001
-From: Michal Klocek <michal.klocek@theqtcompany.com>
-Date: Mon, 7 Dec 2015 15:48:32 +0200
-Subject: [PATCH] Fix slow video with webengine on nitrogen6x
-
-Disable texture_rg on nitrogen6x. Yocto
-image 1.8 has driver which reports opengl es 3.0
-support, however texture_rg does not
-work properly.
----
- src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-index 58aa147..4ab682a 100644
---- a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-+++ b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-@@ -1258,26 +1258,6 @@ void FeatureInfo::InitializeFeatures() {
-     }
-   }
- 
--  if ((gl_version_info_->is_es3 || gl_version_info_->is_desktop_core_profile ||
--       extensions.Contains("GL_EXT_texture_rg") ||
--       extensions.Contains("GL_ARB_texture_rg")) &&
--      IsGL_REDSupportedOnFBOs()) {
--    feature_flags_.ext_texture_rg = true;
--    AddExtensionString("GL_EXT_texture_rg");
--
--    validators_.texture_format.AddValue(GL_RED_EXT);
--    validators_.texture_format.AddValue(GL_RG_EXT);
--    validators_.texture_internal_format.AddValue(GL_RED_EXT);
--    validators_.texture_internal_format.AddValue(GL_R8_EXT);
--    validators_.texture_internal_format.AddValue(GL_RG_EXT);
--    validators_.texture_internal_format.AddValue(GL_RG8_EXT);
--    validators_.read_pixel_format.AddValue(GL_RED_EXT);
--    validators_.read_pixel_format.AddValue(GL_RG_EXT);
--    validators_.render_buffer_format.AddValue(GL_R8_EXT);
--    validators_.render_buffer_format.AddValue(GL_RG8_EXT);
--    validators_.texture_unsized_internal_format.AddValue(GL_RED_EXT);
--    validators_.texture_unsized_internal_format.AddValue(GL_RG_EXT);
--  }
-   UMA_HISTOGRAM_BOOLEAN("GPU.TextureRG", feature_flags_.ext_texture_rg);
- 
-   bool has_opengl_dual_source_blending =
--- 
-1.9.1
-
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
deleted file mode 100644
index 9d4ef68..0000000
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ /dev/null
@@ -1,34 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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_append_mx6 = " \
-    file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
-    "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 0721ec2..46c5f2a 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="0924e7a15d9ce36ef1869175cae3738071bd9edb"
+           revision="50c4963980164ae0e9992d652fd934d85fd2400e"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index e6d945f..4ae42e8 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -53,9 +53,8 @@ for S in $SHA1S; do
     elif [ "${PROJECT}" = "qtlocation/src/3rdparty/mapbox-gl-native" ]; then
         sed -i -e "/^SRCREV_qtlocation-mapboxgl/s/\".*\"/\"${SHA1}\"/" qtlocation_git.bb*
         echo "qtlocation (mapboxgl) -> ${SHA1}"
-    elif [ "${PROJECT}" = "tqtc-qmlcompiler" ] && [ -e "qtquickcompiler_git.bb" ]; then
-        sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb
-        echo "qtquickcompiler -> ${SHA1}"
+    elif [ "${PROJECT}" = "qtenginio" ] || [ "${PROJECT}" = "qtquick1" ] || [ "${PROJECT}" = "qtsystems" ]; then
+        echo "${PROJECT} -> ignored"
     elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then
         sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb*
         echo "${PROJECT} -> ${SHA1}"