summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc8
1 files changed, 7 insertions, 1 deletions
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 = "\
101 ${QT_BASE_NAME}-qt3to4 \ 101 ${QT_BASE_NAME}-qt3to4 \
102 ${QT_BASE_NAME}-qml-plugins" 102 ${QT_BASE_NAME}-qml-plugins"
103 103
104#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
105PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
104PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" 106PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
105PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*" 107PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*"
106 108
@@ -109,6 +111,7 @@ ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
109FILES_${PN} = "" 111FILES_${PN} = ""
110FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" 112FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
111FILES_${PN}-dbg = "${exec_prefix}/src/debug/" 113FILES_${PN}-dbg = "${exec_prefix}/src/debug/"
114FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch"
112RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" 115RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
113RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" 116RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
114RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" 117RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
@@ -124,13 +127,16 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \
124 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 127 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
125 ${QT_BASE_NAME}-plugin-imageformat-jpeg \ 128 ${QT_BASE_NAME}-plugin-imageformat-jpeg \
126 ${QT_BASE_NAME}-qml-plugins \ 129 ${QT_BASE_NAME}-qml-plugins \
127 ${QT_BASE_NAME}-assistant" 130 ${QT_BASE_NAME}-assistant \
131 ${QT_BASE_NAME}-demos-doc"
128RRECOMMENDS_${QT_BASE_NAME}-examples += " \ 132RRECOMMENDS_${QT_BASE_NAME}-examples += " \
129 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 133 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
130 ${QT_BASE_NAME}-plugin-imageformat-jpeg \ 134 ${QT_BASE_NAME}-plugin-imageformat-jpeg \
131 ${QT_BASE_NAME}-qml-plugins" 135 ${QT_BASE_NAME}-qml-plugins"
132RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \ 136RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
133 ${QT_BASE_NAME}-qml-plugins" 137 ${QT_BASE_NAME}-qml-plugins"
138RRECOMMENDS_${QT_BASE_NAME}-doc += " \
139 ${QT_BASE_NAME}-demos-doc"
134 140
135FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" 141FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*"
136FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" 142FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*"