Enable Qt Quick Compiler

Build Qt Quick Compiler and use it for VKB and QtCharts.
Use BBCLASSEXTEND to build all 3 version (target, native
and nativesdk) of Qt Quick Compiler.

Change-Id: I611fe7762b8d9124b146b7fe976f09130d5912fa
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

7 files changed, 87 insertions, 4 deletions

diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
new file mode 100644
index 0000000..202d592
--- /dev/null
+++ b/classes/qtquickcompiler.bbclass
@@ -0,0 +1,13 @@
+EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend"
+
+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
+#}
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 1979879..b424fb7 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
@@ -31,4 +31,5 @@ RDEPENDS_${PN} += "\
     nativesdk-qttools \
     nativesdk-qtbase-tools \
     nativesdk-qtbase-tools-staticdev \
+    nativesdk-qtquickcompiler-tools \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb
index 66e7457..f009340 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb
@@ -32,5 +32,6 @@ RDEPENDS_${PN} += " \
     qtenterprisecontrols-dev \
     qtcharts-dev \
     qtvirtualkeyboard-dev \
+    qtquickcompiler-dev \
     b2qt-utils-dev \
     "
diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb
index 4b350de..77fe3c3 100644
--- a/recipes-qt/qt5-addons/qtcharts_2.0.bb
+++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb
@@ -24,7 +24,7 @@ DESCRIPTION = "Qt Charts"
 LICENSE = "QtEnterprise"
 LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e430de;beginline=1;endline=17"
 
-inherit qt5-module
+inherit qt5-module qtquickcompiler
 
 SRC_URI = " \
     git://qt-gerrit.it.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb
new file mode 100644
index 0000000..fd7e8be
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb
@@ -0,0 +1,44 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+DESCRIPTION = "Qt Quick Compiler"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6"
+
+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 \
+    "
+
+SRCREV_compiler = "60c13275dec85d8224ea5826ae5533d87c65e76e"
+QT_BRANCH_compiler = "2.0"
+
+SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea"
+QT_BRANCH_sdk = "master"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "qtbase qtdeclarative"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
index 40669e1..25441aa 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
@@ -24,7 +24,7 @@ DESCRIPTION = "Qt Virtual Keyboard"
 LICENSE = "QtEnterprise"
 LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd857aa1538823b6;beginline=1;endline=17"
 
-inherit qt5-module
+inherit qt5-module qtquickcompiler
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -32,14 +32,14 @@ SRC_URI = " \
     git://qt-gerrit.it.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \
     "
 
-SRCREV = "fa1aae525f94e9a870d0fcc0fb1be50648b76739"
+SRCREV = "b5f0a28522f2fcb916966bd0da0b86f2d93d2b97"
 QT_BRANCH = "master"
 
 S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative hunspell"
 
-EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-xcb"
+EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop"
 
 FILES_${PN}-qmlplugins-dbg = " \
     ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \
diff --git a/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
new file mode 100644
index 0000000..e6651e5
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
@@ -0,0 +1,24 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# Needed by qtxmlpatterns
+EXTRA_QTLIB = "Network Sql"