2 files changed, 34 insertions, 14 deletions

diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 202d592..1478741 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -1,13 +1,34 @@
-EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend"
+#############################################################################
+##
+## 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$
+##
+#############################################################################
 
-DEPENDS_prepend = "qtquickcompiler qtquickcompiler-native "
-
-#python __anonymous() {
-# do the magic:
-# if QT_SDK path is set,
-#   add dependency to qtquickcompiler-sdk-native package that
-#   copies the needed files (binary and mkspec files) from the SDK
-# else
-#   add dependency to qtquickcompiler-native package that
-#   builds it from internal repos
-#}
+python __anonymous() {
+    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 pn.startswith("nativesdk-"):
+            d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools")
+        else:
+            d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native")
+            d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend")
+}
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 b424fb7..0437c42 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
@@ -24,12 +24,11 @@ DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK"
 LICENSE = "QtEnterprise"
 PR = "r0"
 
-inherit nativesdk packagegroup
+inherit nativesdk packagegroup qtquickcompiler
 
 RDEPENDS_${PN} += "\
     nativesdk-packagegroup-b2qt-embedded-toolchain-host \
     nativesdk-qttools \
     nativesdk-qtbase-tools \
     nativesdk-qtbase-tools-staticdev \
-    nativesdk-qtquickcompiler-tools \
     "