diff options
| author |   Denis Carikli <denis@eukrea.com> | 2011-09-15 18:19:16 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-04 11:34:22 +0100 |
| commit | 97446651cd5128ca7a549df677c920e2463c46f9 (patch) | |
| tree | 506c9ddb86e5567969a86f2e72ac22b11b0951f8 /meta/recipes-qt | |
| parent | 026b59180fe3fbeb43cfd143f053ef33f482ef0c (diff) | |
| download | openembedded-core-97446651cd5128ca7a549df677c920e2463c46f9.tar.gz | |
qt4.inc: package qtdemo's docs in a separate package
The documentation was 285M and doesn't fit on the NAND of many machines,
but in another had part of the documentation is needed for the
QT demos, so we split the documentation: so qt demo only RRECOMMAND
the documentation that it really needs.
Thanks to Eric Bénard for explaining me how to split it.
Signed-off-by: Denis Carikli <denis@eukrea.com>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index a360ec3440..93feb0ed34 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r28" +INC_PR = "r30" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 23832db8a3..eb01a1b759 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -101,6 +101,8 @@ OTHER_PACKAGES = "\ ${QT_BASE_NAME}-qt3to4 \ ${QT_BASE_NAME}-qml-plugins" +#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before. +PACKAGES =+ "${QT_BASE_NAME}-demos-doc" PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*" @@ -109,6 +111,7 @@ ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" FILES_${PN} = "" FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" FILES_${PN}-dbg = "${exec_prefix}/src/debug/" +FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch" RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" @@ -124,13 +127,16 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \ ${QT_BASE_NAME}-qml-plugins \ - ${QT_BASE_NAME}-assistant" + ${QT_BASE_NAME}-assistant \ + ${QT_BASE_NAME}-demos-doc" RRECOMMENDS_${QT_BASE_NAME}-examples += " \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \ ${QT_BASE_NAME}-qml-plugins" RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \ ${QT_BASE_NAME}-qml-plugins" +RRECOMMENDS_${QT_BASE_NAME}-doc += " \ + ${QT_BASE_NAME}-demos-doc" FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" |