11 files changed, 36 insertions, 7 deletions

diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass
index fd7b43c..453d94e 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/classes/populate_b2qt_qt5_sdk.bbclass
@@ -30,6 +30,7 @@
 inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo
 
 SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs"
+NATIVE_SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKPATHNATIVE}${libdir}/${QT_DIR_NAME}/mkspecs"
 SDK_MKSPEC = "devices/linux-oe-generic-g++"
 SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri"
 SDK_DYNAMIC_FLAGS = "-O. -pipe -g"
@@ -66,6 +67,14 @@ EOF
     echo 'HostSpec = linux-g++' >> $qtconf
     echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
 
+    # Update correct host_build ARCH and ABI to mkspecs/qconfig.pri
+    QT_ARCH=$(grep QT_ARCH ${NATIVE_SDK_MKSPEC_DIR}/qconfig.pri | tail -1)
+    QT_BUILDABI=$(grep QT_BUILDABI ${NATIVE_SDK_MKSPEC_DIR}/qconfig.pri | tail -1)
+
+    sed -e "0,/QT_ARCH/s/^.*QT_ARCH.*/$QT_ARCH/" \
+        -e "0,/QT_BUILDABI/s/^.*QT_BUILDABI.*/$QT_BUILDABI/" \
+        -i ${SDK_MKSPEC_DIR}/qconfig.pri
+
     create_qtcreator_configure_script
 
     # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index c36e4c4..3a1bcbe 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -49,5 +49,5 @@ python __anonymous() {
         d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider)
     else:
         d.appendVar('DEPENDS', " %s %s-native" % (provider, provider))
-        d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend")
+        d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler")
 }
diff --git a/conf/machine/qemuarmv7.conf b/conf/machine/qemuarmv7.conf
new file mode 100644
index 0000000..530f802
--- /dev/null
+++ b/conf/machine/qemuarmv7.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: generic armv machine
+#@DESCRIPTION: Machine configuration for running a generic armv7
+
+DEFAULTTUNE = "armv7athf-neon"
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/arch-armv7a.inc
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
index bcc22a8..15981b0 100755
--- a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
+++ b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
@@ -46,7 +46,7 @@ GADGET_CONFIG=$CONFIGFS_PATH/usb_gadget/g1
 
 . /etc/default/qdbd
 
-function initialize_gadget() {
+initialize_gadget() {
     # Initialize gadget with first UDC driver
     for driverpath in /sys/class/udc/*; do
         drivername=`basename $driverpath`
@@ -55,7 +55,7 @@ function initialize_gadget() {
     done
 }
 
-function disable_gadget() {
+disable_gadget() {
     echo "" > $GADGET_CONFIG/UDC
 }
 
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 a65435f..c3f07b8 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
@@ -43,6 +43,7 @@ RDEPENDS_${PN} += "\
     nativesdk-packagegroup-b2qt-embedded-toolchain-host \
     nativesdk-qttools-tools \
     nativesdk-qtbase-tools \
+    nativesdk-qtbase-tools-dev \
     nativesdk-qtbase-tools-staticdev \
     nativesdk-qtdeclarative-tools \
     nativesdk-qtdeclarative-staticdev \
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 b2b8d69..98ec531 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -69,7 +69,7 @@ RDEPENDS_${PN} += " \
     qttools-staticdev \
     qtvirtualkeyboard-dev \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev qtwebview-dev', '', d)} \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 50ce015..f07315c 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -69,7 +69,7 @@ RDEPENDS_${PN} += " \
     qttranslations-qtwebsockets \
     qttranslations-qtxmlpatterns \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine qtwebview', '', d)} \
     qtwebsockets \
     qtwebchannel \
     qtxmlpatterns \
diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
index 7f3e85b..3743623 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
@@ -56,6 +56,9 @@ do_install() {
         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() {
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 80fd072..d0663e2 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -43,4 +43,9 @@ 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/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index 2a949eb..57c8285 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,3 +29,5 @@
 
 EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
 DEPENDS_append_emulator = " qtsimulator"
+
+SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 4f4e1a8..e77f96d 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -37,6 +37,7 @@ UPLOADS="\
     tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \
     tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \
+    tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \
     "
 
 for f in ${UPLOADS}; do