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

1 files changed, 16 insertions, 9 deletions

diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 16fb6fe..b6710be 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -20,16 +20,23 @@
 ##############################################################################
 
 python __anonymous() {
+    provider = "qtquickcompiler"
+
     sdk_path = d.getVar('QT_SDK_PATH', True) or ""
     if len(sdk_path) != 0:
-        bb.note("TODO: QtQuickCompiler not yet available for external builds")
-    else:
-        pn = d.getVar("PN", True)
-        if "toolchain-host" in pn:
-            d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools")
-        if "toolchain-target" in pn:
-            d.appendVar('RDEPENDS_' + pn, " qtquickcompiler-dev")
+        qtquickcompiler_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
+        if not os.path.isdir(qtquickcompiler_path):
+            bb.note("QtQuickCompiler not available")
+            return
         else:
-            d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native")
-            d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend")
+            provider = "qtquickcompiler-sdk"
+
+    pn = d.getVar("PN", True)
+    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 CONFIG+=no_qtquickcompiler_depend")
 }