diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-02-16 10:47:02 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-02-17 09:43:47 +0100 |
| commit | fba63ed00f92f939529bd1fd1f47a8d715f8bea8 (patch) | |
| tree | 113450dc1c92b51d66e0e8c391476ebefbb90ade /recipes/qt4/qt4.inc | |
| parent | 7194635729b20c15d41a08c89a30a5a8aabbc090 (diff) | |
qt4: add 4.6.2
* fix 4.6.1 references in 4.6.0 files as well
* make qt-config.patch work with QT_NO_CAST_{TO,FROM},ASCII strict checking
Diffstat (limited to 'recipes/qt4/qt4.inc')
| -rw-r--r-- | recipes/qt4/qt4.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 62fcec11a2..c98a0557e5 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -96,7 +96,7 @@ RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" -FILES_${QT_BASE_NAME}-tools = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay" +FILES_${QT_BASE_NAME}-tools = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*" FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" @@ -164,9 +164,9 @@ do_configure() { -demosdir ${bindir}/${QT_DIR_NAME}/demos \ -platform ${TARGET_OS}-oe-g++ \ -xplatform ${TARGET_OS}-oe-g++ \ - -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ + -embedded ${QT_ARCH} ${QT_ENDIAN} \ -crossarch ${QT_ARCH} \ - ${QT_CONFIG_FLAGS} -fast \ + ${QT_CONFIG_FLAGS} -no-fast \ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ -I${STAGING_INCDIR}/freetype2 \ -I${STAGING_INCDIR}/mysql \ |