From f11b1722e28800c790609d0de9541f6555e1ee5a Mon Sep 17 00:00:00 2001
From: Tasslehoff Kjappfot <tasskjapp@gmail.com>
Date: Thu, 29 Aug 2013 09:53:44 +0200
Subject: [PATCH] qtquickcontrols: Add module for 5.1.0 and git versions

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 conf/distro/include/qt5-versions.inc    | 1 +
 recipes-qt/qt5/qt5.inc                  | 8 +++++++-
 recipes-qt/qt5/qtbase.inc               | 1 +
 recipes-qt/qt5/qtquickcontrols.inc      | 3 +++
 recipes-qt/qt5/qtquickcontrols_5.1.0.bb | 5 +++++
 recipes-qt/qt5/qtquickcontrols_git.bb   | 4 ++++
 6 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qt5/qtquickcontrols.inc
 create mode 100644 recipes-qt/qt5/qtquickcontrols_5.1.0.bb
 create mode 100644 recipes-qt/qt5/qtquickcontrols_git.bb

diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 81cb8cbb51..f534de70a6 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -12,6 +12,7 @@ PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}"
 PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}"
 PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}"
 PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}"
+PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}"
 PREFERRED_VERSION_qtsensors = "${QT5_VERSION}"
 PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
 PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 80acb73e39..a9d3000cb9 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -39,7 +39,7 @@ FILES_${PN}-plugins-dbg = " \
 "
 
 # extra packages
-# qmlplugins 1-3 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
+# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
 FILES_${PN}-qmlplugins = " \
     ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
     ${OE_QMAKE_PATH_QML}/*/qmldir \
@@ -56,6 +56,12 @@ FILES_${PN}-qmlplugins = " \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \
     ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \
     ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \
     ${OE_QMAKE_PATH_IMPORTS}/*/*.qmltypes \
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index e8b240670b..b6927d1a05 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -65,6 +65,7 @@ PACKAGECONFIG[release] = "-release,-debug"
 PACKAGECONFIG[sm] = "-sm,-no-sm"
 PACKAGECONFIG[tests] = ",-nomake tests"
 PACKAGECONFIG[examples] = ",-nomake examples"
+# accessibility is required to compile qtquickcontrols
 PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility"
 PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0"
 PACKAGECONFIG[freetype] = "-system-freetype,-no-freetype,freetype"
diff --git a/recipes-qt/qt5/qtquickcontrols.inc b/recipes-qt/qt5/qtquickcontrols.inc
new file mode 100644
index 0000000000..63e884eaa6
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols.inc
@@ -0,0 +1,3 @@
+require qt5.inc
+
+DEPENDS += "qtdeclarative"
diff --git a/recipes-qt/qt5/qtquickcontrols_5.1.0.bb b/recipes-qt/qt5/qtquickcontrols_5.1.0.bb
new file mode 100644
index 0000000000..fc880d75f1
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_5.1.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "b3825124a173a36f63c2f8380dc61e81"
+SRC_URI[sha256sum] = "88d39421d78464c3900c37616e8369fc8d998c1b0f611980e6e082f46569646b"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
new file mode 100644
index 0000000000..ded017bd92
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -0,0 +1,4 @@
+require qt5-git.inc
+require ${PN}.inc
+
+SRCREV = "c304d741a27b5822a35d1fb83f8f5e65719907ce"