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

* origin/fido: (36 commits)
  qt5: update submodules
  b2qt-demos: update revision
  b2qt-appcontroller: update revision
  qt5: move mingw32 specific parts from meta-qt5
  qt5: Use latest version of meta-qt5
  b2qt-demos: update to new revision
  ostree: Mount boot partition from user space
  ostree: Do not use grub2-mkconfig.
  RPi2: add support for touch display
  Disable ethernet over usb on beaglebone.
  qtwayland: update SRCREV
  Move default sstate-cache dir from build dir
  Use distro specific sstate cache
  qtquickcompiler: add support for BYOS builds
  qtcharts: update revision
  qt5: update submodules
  democompositor: use correct path the SDK sources
  b2qt-demos: update SRCREV
  Add git SHA1 to b2qt addon package versions
  b2qt-utils: update SRCREV
  ...

Conflicts:
	recipes-qt/qt5/qtconnectivity_git.bbappend

Change-Id: I1c090c8f87e43664971e0381b93ccad5e4e48175

40 files changed, 312 insertions, 62 deletions

diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index ebf585d..b083a4f 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -30,8 +30,9 @@ SRC_URI = " \
     file://appcontroller.conf \
     "
 
-SRCREV = "af3ab8ec0213a40d90f3d58a8a65a944b0cd753e"
+SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index 9270a0f..55b7f98 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -34,12 +34,12 @@ SRC_URI = " \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
     "
 
-PV = "1.0+git${SRCPV}"
+PV = "5.6+git${SRCPV}"
 
 BRANCH = "5.6"
 BROWSER_BRANCH = "dev"
 QT_BRANCH = "5.6"
-SRCREV_demos = "d9d77da89ac7fea96fae940b74c0dfc2225d0b52"
+SRCREV_demos = "1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033"
 SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
 SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
 SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc"
@@ -59,14 +59,14 @@ do_install_append() {
     # we only need plugins from the demos
     rm -rf ${D}/data/user/camera
     rm -rf ${D}/data/user/sensorexplorer
+    rm -rf ${D}/data/user/qtwebbrowser
 
     # we need all qml and content files
     cp -r ${S}/* ${D}/data/user/qt/
 
     # but none of the source files
     find ${D}/data/user/qt/ \( -name '*.cpp' -or -name '*.h' -or -name '*.pro' \) -delete
-    rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser/.git
-    rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser/mockups
+    rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser
 
     if [ -d ${WORKDIR}/git/images ]; then
         install -d 0755 ${D}/data/images
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
index 4b92c52..7f4b083 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
@@ -33,6 +33,7 @@ SRC_URI = " \
 
 SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
 BRANCH = "master"
+PV = "1.0+git${SRCPV}"
 
 S = "${WORKDIR}/git/src/helperlibs/proxy"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
index b3e95e4..7b51ece 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
@@ -33,6 +33,7 @@ SRC_URI = " \
 
 SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
 BRANCH = "master"
+PV = "1.0+git${SRCPV}"
 
 S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
index 7b6f2c0..3b1da08 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
@@ -31,6 +31,7 @@ SRC_URI = " \
 
 SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
 BRANCH = "master"
+PV = "1.0+git${SRCPV}"
 
 EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index b73b477..ea85c86 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -32,8 +32,9 @@ SRC_URI = " \
     file://b2qt.service \
     "
 
-SRCREV = "b92077ac6962c9f42f778facbdea4a81affb22c1"
+SRCREV = "f5aaf9297648b397ee8fecb0a494b4774e130422"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb
index 00efce9..f43e450 100644
--- a/recipes-qt/b2qt-addons/b2qt-utils.bb
+++ b/recipes-qt/b2qt-addons/b2qt-utils.bb
@@ -29,8 +29,9 @@ SRC_URI = " \
     git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-utils \
     "
 
-SRCREV = "2b81f8dbc97b446b33fb67e3196a8726ed195008"
+SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index 0d2c3db..314e491 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -26,11 +26,12 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=56e7f80d726792929d5d089852de7cde;beginli
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-demos \
+    git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos \
     "
 
 SRCREV = "b6217fb2bb7702324da2a9f3f45be4a60e6ffe6c"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git/wayland/democompositor/"
 
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 7f0867e..c784787 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -31,5 +31,5 @@ RDEPENDS_${PN} += " \
     b2qt-utils \
     b2qt-launcher \
     b2qt-demos \
-    democompositor \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
     "
diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5-addons/qtcharts_git.bb
index c6c1997..090276b 100644
--- a/recipes-qt/qt5-addons/qtcharts_git.bb
+++ b/recipes-qt/qt5-addons/qtcharts_git.bb
@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
-SRCREV = "672ea1cb191f9d386ce32b96102fe638fcae5fba"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5-addons/qtdatavis3d_git.bb
index 155c8f0..a148bdc 100644
--- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5-addons/qtdatavis3d_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
index 38de1a5..5162519 100644
--- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
+++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"
 
 DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
new file mode 100644
index 0000000..04a0b3a
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
@@ -0,0 +1,58 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+DESCRIPTION = "Qt Quick Compiler using prebuilt binaries from Qt SDK"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+
+inherit allarch qmake5_paths
+
+DEPENDS = "qtbase"
+
+S = "${WORKDIR}"
+
+QT_VERSION = "5.6"
+
+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
+}
+
+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}"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
index 5639d60..f4bdbcc 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf"
 
 DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index fd8a462..312f6b2 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -19,9 +19,14 @@
 ##
 ##############################################################################
 
-# Needed by qtxmlpatterns
-EXTRA_QTLIB_append = " Network Sql"
-# Needed by qttools
-EXTRA_QTLIB_append = " Xml"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b"
 
-SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
+FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
+
+SRC_URI += "\
+    file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
+    "
+
+fakeroot do_generate_qt_environment_file_mingw32() {
+}
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 59b6b33..1818817 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -25,18 +25,5 @@ SRC_URI_append_class-target = " \
     file://0001-Remove-qgltf.patch \
     "
 
-SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7"
-
-DEPENDS += "qt3d-native"
-
-SRC_URI += " \
-    file://0001-Allow-a-tools-only-build.patch \
-    "
-PACKAGECONFIG ??= ""
-PACKAGECONFIG_class-native ??= "tools-only"
-PACKAGECONFIG_class-nativesdk ??= "tools-only"
-PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
-
-EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
-
-BBCLASSEXTEND += "native nativesdk"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 2a767e9..ee14664 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -19,4 +19,11 @@
 ##
 ##############################################################################
 
-SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
+
+SRC_URI += "\
+    file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
+    "
diff --git a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
new file mode 100644
index 0000000..7ce3a9e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
@@ -0,0 +1,180 @@
+From 5363b4d6d1f3c5683267ec3e190b85eca964eef8 Mon Sep 17 00:00:00 2001
+From: David Schulz <david.schulz@theqtcompany.com>
+Date: Fri, 3 Jul 2015 16:06:59 +0200
+Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment.
+
+Upstream-Status: Inappropriate [embedded specific]
+                 too OE specific, probably cannot be upstreamed
+---
+ mkspecs/win32-g++-oe/qmake.conf      | 109 +++++++++++++++++++++++++++++++++++
+ mkspecs/win32-g++-oe/qplatformdefs.h |  42 ++++++++++++++
+ 2 files changed, 151 insertions(+)
+ create mode 100644 mkspecs/win32-g++-oe/qmake.conf
+ create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h
+
+diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf
+new file mode 100644
+index 0000000..1c8879a
+--- /dev/null
++++ b/mkspecs/win32-g++-oe/qmake.conf
+@@ -0,0 +1,109 @@
++#
++# qmake configuration for win32-g++
++#
++# Written for MinGW / gcc 4.6 or higher
++#
++# Cross compile example for i686-w64-mingw32-g++:
++#   configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
++#
++
++load(device_config)
++
++MAKEFILE_GENERATOR      = MINGW
++QMAKE_PLATFORM          = win32 mingw
++CONFIG                 += debug_and_release debug_and_release_target precompile_header
++DEFINES                += UNICODE
++QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
++
++QMAKE_EXT_OBJ           = .o
++QMAKE_EXT_RES           = _res.o
++
++QMAKE_COMPILER          = $(OE_QMAKE_COMPILER) gcc
++
++QMAKE_CC                = $(OE_QMAKE_CC)
++QMAKE_LEX               = flex
++QMAKE_LEXFLAGS          =
++QMAKE_YACC              = byacc
++QMAKE_YACCFLAGS         = -d
++QMAKE_CFLAGS            = -pipe $(OE_QMAKE_CFLAGS)
++QMAKE_CFLAGS_DEPS       = -M
++QMAKE_CFLAGS_WARN_ON    = -Wall -Wextra
++QMAKE_CFLAGS_WARN_OFF   = -w
++QMAKE_CFLAGS_RELEASE    = -O2
++QMAKE_CFLAGS_DEBUG      = -g
++QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
++QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
++QMAKE_CFLAGS_SSE2       = -msse2 -mstackrealign
++QMAKE_CFLAGS_SSE3       = -msse3
++QMAKE_CFLAGS_SSSE3      = -mssse3
++QMAKE_CFLAGS_SSE4_1     = -msse4.1
++QMAKE_CFLAGS_SSE4_2     = -msse4.2
++QMAKE_CFLAGS_AVX        = -mavx
++QMAKE_CFLAGS_AVX2       = -mavx2
++QMAKE_CFLAGS_NEON       = -mfpu=neon
++
++QMAKE_CXX               = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
++QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
++QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
++QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
++QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
++QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
++QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
++QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
++QMAKE_CXXFLAGS_RTTI_ON  = -frtti
++QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
++QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
++QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
++QMAKE_CXXFLAGS_CXX11    = -std=c++0x
++QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS
++
++QMAKE_INCDIR            =
++
++QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
++QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
++QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
++
++QMAKE_LINK              = $(OE_QMAKE_LINK)
++QMAKE_LINK_C            = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS            = $(OE_QMAKE_LDFLAGS)
++QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
++QMAKE_LFLAGS_EXCEPTIONS_OFF =
++QMAKE_LFLAGS_RELEASE    = -Wl,-s
++QMAKE_LFLAGS_DEBUG      =
++QMAKE_LFLAGS_CONSOLE    = -Wl,-subsystem,console
++QMAKE_LFLAGS_WINDOWS    = -Wl,-subsystem,windows
++QMAKE_LFLAGS_DLL        = -shared
++QMAKE_LFLAGS_CXX11      =
++QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
++QMAKE_LFLAGS_USE_GOLD   = -fuse-ld=gold
++QMAKE_LINK_OBJECT_MAX   = 10
++QMAKE_LINK_OBJECT_SCRIPT = object_script
++QMAKE_PREFIX_SHLIB      =
++QMAKE_EXTENSION_SHLIB   = dll
++QMAKE_PREFIX_STATICLIB  = lib
++QMAKE_EXTENSION_STATICLIB = a
++QMAKE_LIB_EXTENSIONS    = a dll.a
++
++QMAKE_LIBS              =
++QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
++QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
++QMAKE_LIBS_NETWORK      = -lws2_32
++QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2   = -llibEGL -llibGLESv2 -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -lgdi32 -luser32
++QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
++QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
++
++QMAKE_IDL               = midl
++QMAKE_LIB               = $(OE_QMAKE_AR) -ru
++QMAKE_RC                = $(RC)
++
++QMAKE_STRIP             = $${OE_QMAKE_STRIP}
++QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
++QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
++QMAKE_NM                = $${CROSS_COMPILE}nm -P
++
++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
++load(qt_config)
+diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h
+new file mode 100644
+index 0000000..9d63527
+--- /dev/null
++++ b/mkspecs/win32-g++-oe/qplatformdefs.h
+@@ -0,0 +1,42 @@
++/****************************************************************************
++**
++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the qmake spec of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** 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 Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "../win32-g++/qplatformdefs.h"
+-- 
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 65a9b1d..0b4774a 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -39,20 +39,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
     file://oe-device-extra.pri \
+    file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
     "
 do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
 
-SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b"
 
 # Temporarily here, until merged upstream
-PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
-
-do_install_append() {
-    # Temporarily here, until merged upstream
-    sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \
-        -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
-        ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
-}
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 0a8d678..9478428 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 67cd0dd..8057fbb 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -19,5 +19,6 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3"
 
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index 09944d9..626014a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "19dffeed2e677cf03b6e122c7a15f355ebe413c8"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index 972f725..7f854d5 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 4213bc9..f3895a6 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index a012288..3308e33 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -24,4 +24,5 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "526f459330d9bb5238479523f45aaa4caa958f77"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index eaebada..1793fdd 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -21,4 +21,5 @@
 
 PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
 
-SRCREV = "241444eab724ba0cb4fa142c5ccb02243b6f2dc2"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index f899df0..c7df857 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index 457e0fd..d570ec2 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -22,4 +22,5 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "ad52d307cbff44b77bf7d4fa923377b72bb04374"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index d06444b..c833730 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -31,4 +31,5 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "c3f263509b64814ba12dbb627897de00b05230bc"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "48f32572590e45a57573944c0822855819d138df"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index 188e736..7e72190 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "6ba354a0ec3bd3064d072cf170fe9f60f9ae3389"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index 56a80d9..27ed9e2 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 932f535..7244baf 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "eb59d8084af321d05b4ebdfb2c1e051dfdca0b62"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index e8b1d19..9c5261a 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -19,9 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde"
-
-PACKAGES += "${PN}-qtwebengine"
-FILES_${PN}-qtwebengine = " \
-    ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \
-"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index cd4d339..57cc2e7 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "29b8bd8b1117589341110502fe516bf22c920747"
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb
index 0828a42..2de879b 100644
--- a/recipes-qt/qt5/qtwayland_5.7-wip.bb
+++ b/recipes-qt/qt5/qtwayland_5.7-wip.bb
@@ -21,7 +21,7 @@
 
 require recipes-qt/qt5/qtwayland_git.bb
 
-SRCREV = "600d845ff4a89982dd6a8c9fa0dd60b2bf861ff5"
+SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658"
 PV = "5.7-wip+git${SRCPV}"
 QT_MODULE_BRANCH = "wip-compositor-api"
 EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index cd4d339..57cc2e7 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "29b8bd8b1117589341110502fe516bf22c920747"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index ac958c0..2179f58 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 75d65a5..381bbbd 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -25,5 +25,6 @@ SRC_URI_append_mx6 = " \
     file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
     "
 
-SRCREV_qtwebengine = "bc2b0d81a8eff28852c9916a4768f05638d5d4cd"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f"
 SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 528e5b6..ea08e2e 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index 287ed42..f45b633 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915"