Update to using Qt 5.5

Changes required to support Qt 5.5.
- eglfs hooks are now plugins
- disable Qt .bbappends from meta-fsl-extra
- include qt3d and qtcanvas3d to image
- remove QtQuickEnterpriseControls
- use Qt Quick Compiler 3.0
- update Qt VKB sha1
- use 5.5 branch from meta-qt5 (playground repo)

Change-Id: I6fe830ee1edf6937c40ddedba06fdf1694f9dacc
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>

7 files changed, 13 insertions, 13 deletions

diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb
index 3ba3f83..76c4430 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb
@@ -29,8 +29,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     qtdatavisualization \
-    qtquickenterprisecontrols \
-    qtquickenterprisecontrols-fonts \
     qtcharts \
     qtvirtualkeyboard \
     b2qt-appcontroller \
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 a4fc1fa..0fb16ef 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -36,6 +36,7 @@ RDEPENDS_${PN} += " \
     qt3d-dev \
     qtbase-dev \
     qtbase-staticdev \
+    qtcanvas3d \
     qtconnectivity-dev \
     qtdeclarative-dev \
     qtdeclarative-staticdev \
@@ -50,9 +51,9 @@ RDEPENDS_${PN} += " \
     qttools-dev \
     qttools-staticdev \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
     qtquickcontrols-dev \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
index c09d245..93785a0 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
@@ -28,8 +28,10 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
+    qt3d \
     qtbase \
     qtbase-fonts \
+    qtcanvas3d \
     qtconnectivity \
     qtdeclarative \
     qtdeclarative-tools \
@@ -41,8 +43,8 @@ RDEPENDS_${PN} += " \
     qtserialport \
     qtsvg \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
     qtwebsockets \
     qtxmlpatterns \
     qtquickcontrols \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
     "
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
index fd7e8be..6f9fa30 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
@@ -27,15 +27,15 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca
 inherit qt5-module
 
 SRC_URI = " \
-    git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${QT_BRANCH};protocol=ssh;name=compiler;destsuffix=git \
-    git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${QT_BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \
+    git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \
+    git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \
     "
 
-SRCREV_compiler = "60c13275dec85d8224ea5826ae5533d87c65e76e"
-QT_BRANCH_compiler = "2.0"
+SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e"
+BRANCH_compiler = "3.0"
 
 SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea"
-QT_BRANCH_sdk = "master"
+BRANCH_sdk = "master"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
index 571792c..e66373d 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
@@ -32,7 +32,7 @@ SRC_URI = " \
     git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \
     "
 
-SRCREV = "b5f0a28522f2fcb916966bd0da0b86f2d93d2b97"
+SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95"
 QT_BRANCH = "master"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
index cf89ae6..f365169 100644
--- a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
@@ -5,4 +5,4 @@ QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
 QMAKE_CFLAGS           += $$IMX6_CFLAGS
 QMAKE_CXXFLAGS         += $$IMX6_CFLAGS
 
-EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
+EGLFS_DEVICE_INTEGRATION = eglfs_viv
diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
index bddd245..84488cb 100644
--- a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
@@ -6,5 +6,4 @@ QMAKE_LIBS_EGL          = -lEGL -lGLESv2
 QMAKE_CFLAGS           += $$RPI_CFLAGS
 QMAKE_CXXFLAGS         += $$RPI_CFLAGS
 
-EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
-EGLFS_PLATFORM_HOOKS_LIBS    = -lbcm_host
+EGLFS_DEVICE_INTEGRATION = eglfs_brcm