Merge remote-tracking branch 'origin/dizzy' into dev

* origin/dizzy:
  VKB: use correct SHA1 for v1.3.1
  qt5: add qt addons dev packages to the toolchain
  qtquickcompiler: add dev packages to toolchain
  Go back to branch 5.5 in b2qt-demos build
  qt5: use jethro branch for meta-qt5
  qt5: oe-device-extra.pri is now supported in upstream

Change-Id: Ib369f45fe6644d4e44e24e7850c3dfe7431d31f4

13 files changed, 27 insertions, 55 deletions

diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 1478741..acb1bd6 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -26,8 +26,10 @@ python __anonymous() {
         bb.note("TODO: QtQuickCompiler not yet available for external builds")
     else:
         pn = d.getVar("PN", True)
-        if pn.startswith("nativesdk-"):
+        if "toolchain-host" in pn:
             d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools")
+        if "toolchain-target" in pn:
+            d.appendVar('RDEPENDS_' + pn, " qtquickcompiler-dev")
         else:
             d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native")
             d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend")
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index 21ceffc..cdea63d 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -34,7 +34,7 @@ SRC_URI = " \
     "
 
 BRANCH = "5.5"
-QT_BRANCH = "5.5.1"
+QT_BRANCH = "5.5"
 SRCREV_demos = "017d5d428688ca78220e073c393df27936545f14"
 SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e"
 SRCREV_qtcanvas3d = "e372a67c1bbdf695f8e550950a3dbf3106389479"
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf
index dadea00..b5962dc 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf
@@ -4,8 +4,6 @@
 
 include(../common/linux_device_pre.conf)
 
-QMAKE_PLATFORM         += boot2qt
-
 # Load device-specific qmake.conf part, if any
 exists(../../oe-device-extra.pri):include(../../oe-device-extra.pri)
 
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb
deleted file mode 100644
index f009340..0000000
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-DESCRIPTION = "Qt5 addons toolchain packages"
-LICENSE = "QtEnterprise"
-
-inherit packagegroup
-
-PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
-
-RDEPENDS_${PN} += " \
-    qtdatavisualization-dev \
-    qtenterprisecontrols-dev \
-    qtcharts-dev \
-    qtvirtualkeyboard-dev \
-    qtquickcompiler-dev \
-    b2qt-utils-dev \
-    "
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 a64f457..06c1c79 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -24,7 +24,7 @@ DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK"
 LICENSE = "QtEnterprise"
 PR = "r0"
 
-inherit packagegroup
+inherit packagegroup qtquickcompiler
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
@@ -33,6 +33,7 @@ MACHINE_EXTRA_INSTALL_QT_SDK ?= ""
 RDEPENDS_${PN} += " \
     ${MACHINE_EXTRA_INSTALL_QT_SDK} \
     packagegroup-b2qt-embedded-toolchain-target \
+    \
     qt3d-dev \
     qtbase-dev \
     qtbase-staticdev \
@@ -44,6 +45,7 @@ RDEPENDS_${PN} += " \
     qtimageformats-dev \
     qtlocation-dev \
     qtmultimedia-dev \
+    qtquickcontrols-dev \
     qtsensors-dev \
     qtserialport-dev \
     qtsvg-dev \
@@ -54,5 +56,9 @@ RDEPENDS_${PN} += " \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
-    qtquickcontrols-dev \
+    \
+    b2qt-utils-dev \
+    qtcharts-dev \
+    qtdatavisualization-dev \
+    qtvirtualkeyboard-dev \
     "
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
index e1aa642..ec29c65 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
@@ -22,7 +22,7 @@
 
 DESCRIPTION = "Qt Virtual Keyboard"
 LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd857aa1538823b6;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=e0b36905c697f1be9c35712f4aced6e0;beginline=1;endline=17"
 
 inherit qt5-module qtquickcompiler sdk-sources
 
@@ -31,7 +31,7 @@ SRC_URI = " \
     "
 
 # v1.3.1
-SRCREV = "567e2c1d3df5a841160b2c24a390f153b25ad368"
+SRCREV = "c2c362d9f313441351e5e7167e22b4fd1b7012a8"
 BRANCH = "1.3"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
index 3c0971c..9f6fdc3 100644
--- a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
@@ -1,2 +1,5 @@
 QMAKE_LIBS_EGL         = -lQtGlesStreamClient
 QMAKE_LIBS_OPENGL_ES2  = -lQtGlesStreamClient
+
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
index f365169..f5445e3 100644
--- a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
@@ -5,4 +5,6 @@ QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
 QMAKE_CFLAGS           += $$IMX6_CFLAGS
 QMAKE_CXXFLAGS         += $$IMX6_CFLAGS
 
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
 EGLFS_DEVICE_INTEGRATION = eglfs_viv
diff --git a/recipes-qt/qt5/qtbase/oe-device-extra.pri b/recipes-qt/qt5/qtbase/oe-device-extra.pri
index 6c4bdd9..250c999 100644
--- a/recipes-qt/qt5/qtbase/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/oe-device-extra.pri
@@ -1 +1,3 @@
 # This file contains device-specific qmake.conf settings
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
index 84488cb..9f64808 100644
--- a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
@@ -6,4 +6,6 @@ QMAKE_LIBS_EGL          = -lEGL -lGLESv2
 QMAKE_CFLAGS           += $$RPI_CFLAGS
 QMAKE_CXXFLAGS         += $$RPI_CFLAGS
 
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
 EGLFS_DEVICE_INTEGRATION = eglfs_brcm
diff --git a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri b/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
index 6a5edd9..0a18a5d 100644
--- a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
@@ -1,3 +1,6 @@
 QMAKE_LIBS_EGL          = -lEGL -lIMGegl -lsrv_um
 QMAKE_LIBS_OPENGL_ES2   = -lGLESv2 $${QMAKE_LIBS_EGL}
 QMAKE_LIBS_OPENVG       = -lOpenVG $${QMAKE_LIBS_EGL}
+
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index 6ce74b2..daa77c5 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -44,13 +44,4 @@ SRC_URI += " \
 
 do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
-    sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
-    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-QMAKE_PLATFORM         += boot2qt
-QT_QPA_DEFAULT_PLATFORM = eglfs
-
-exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
-
-load(qt_config)
-EOF
 }
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 5f0c16c..9fc0bf6 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -22,7 +22,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="meta-qt5"
-           revision="51b4620392aa9041d8512549bfa554bea368c5ea"
+           revision="89038bffd224a0d43aa8627472374503b3023f61"
            path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"