summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorTasslehoff Kjappfot <tasskjapp@gmail.com>2013-08-29 09:53:44 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-09-17 14:49:33 +0200
commitf11b1722e28800c790609d0de9541f6555e1ee5a (patch)
tree3051dde098713ba8bbfceaafbd7d9fd654e51932 /recipes-qt/qt5
parentf770c5dca9d755ebda51deb1f578f1ec43c68d8b (diff)
downloadmeta-qt5-f11b1722e28800c790609d0de9541f6555e1ee5a.tar.gz
qtquickcontrols: Add module for 5.1.0 and git versions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/qt5.inc8
-rw-r--r--recipes-qt/qt5/qtbase.inc1
-rw-r--r--recipes-qt/qt5/qtquickcontrols.inc3
-rw-r--r--recipes-qt/qt5/qtquickcontrols_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb4
5 files changed, 20 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 80acb73e..a9d3000c 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -39,7 +39,7 @@ FILES_${PN}-plugins-dbg = " \
39" 39"
40 40
41# extra packages 41# extra packages
42# qmlplugins 1-3 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} 42# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
43FILES_${PN}-qmlplugins = " \ 43FILES_${PN}-qmlplugins = " \
44 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ 44 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
45 ${OE_QMAKE_PATH_QML}/*/qmldir \ 45 ${OE_QMAKE_PATH_QML}/*/qmldir \
@@ -56,6 +56,12 @@ FILES_${PN}-qmlplugins = " \
56 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ 56 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
57 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ 57 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
58 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ 58 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \
59 ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \
60 ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \
61 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \
62 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \
63 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \
64 ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \
59 ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ 65 ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \
60 ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ 66 ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \
61 ${OE_QMAKE_PATH_IMPORTS}/*/*.qmltypes \ 67 ${OE_QMAKE_PATH_IMPORTS}/*/*.qmltypes \
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index e8b24067..b6927d1a 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -65,6 +65,7 @@ PACKAGECONFIG[release] = "-release,-debug"
65PACKAGECONFIG[sm] = "-sm,-no-sm" 65PACKAGECONFIG[sm] = "-sm,-no-sm"
66PACKAGECONFIG[tests] = ",-nomake tests" 66PACKAGECONFIG[tests] = ",-nomake tests"
67PACKAGECONFIG[examples] = ",-nomake examples" 67PACKAGECONFIG[examples] = ",-nomake examples"
68# accessibility is required to compile qtquickcontrols
68PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" 69PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility"
69PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" 70PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0"
70PACKAGECONFIG[freetype] = "-system-freetype,-no-freetype,freetype" 71PACKAGECONFIG[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 00000000..63e884ea
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols.inc
@@ -0,0 +1,3 @@
1require qt5.inc
2
3DEPENDS += "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 00000000..fc880d75
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "b3825124a173a36f63c2f8380dc61e81"
5SRC_URI[sha256sum] = "88d39421d78464c3900c37616e8369fc8d998c1b0f611980e6e082f46569646b"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
new file mode 100644
index 00000000..ded017bd
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -0,0 +1,4 @@
1require qt5-git.inc
2require ${PN}.inc
3
4SRCREV = "c304d741a27b5822a35d1fb83f8f5e65719907ce"