summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-embedded.inc
Commit message (Collapse)AuthorAgeFilesLines
* qt4: add RPROVIDES/RREPLACES for qmake2 recipePaul Eggleton2012-03-191-1/+1
| | | | | | | | | | | | OE-Classic and meta-oe provide a qmake2 recipe; since this has been obsoleted by the recent change to provide qmake within the tools package and (in the latter case) will soon be removed, add an RREPLACES to aid upgrades and RPROVIDES to make it easy to install. (From OE-Core rev: 9ba01c3b7ce3d9f822e1cc08cd032e019a15180f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix deps in libQtWebkit.la and QtWebKit.pcAndreas Oberritter2012-03-131-1/+1
| | | | | | | | | | | | | * Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore * These paths and libs don't get installed. * When building a shared lib with libtool, that links with libQtWebKit, libtool adds these unneeded parameters to the linker command-line, thus linking fails. (From OE-Core rev: 4c41a3204ef72f53813ddc86fe525fa9c6714daa) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: depend on tiffAndreas Oberritter2012-02-281-1/+1
| | | | | | | | | | | * Fixes the following error with qt4-embedded-4.8.0 and possibly others: | ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory (From OE-Core rev: d0853052228128ccca2b744dae9c4dceae23067a) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclassOtavio Salvador2012-01-061-2/+1
| | | | | | | (From OE-Core rev: be58cb5b41f0e6c08e9a5f576802c5a5efe7edf6) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc : Add uic, moc, rcc, and lrelease to tools package.Philip Balister2011-12-131-1/+1
| | | | | | | | | | | | | | | | | | | These binaries are needed in the target tools package so we can build qt apps on the target. You also need to install qmake from meta-oe. Tested by building gnuradio on the USRP e100 with qt support. (This effectively reverses OE-core rev 69eeb3d2276e5b10d084b47d308ecfc8daf8b467, however test builds for qemux86 and qemumips produced no packaging warnings such as those described in that commit, and the architecture of the executables is correct.) (From OE-Core rev: c96db08915a554fb5e4bb2c360b919c8392b32c6) Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: various tidy-upsPaul Eggleton2011-12-081-2/+1
| | | | | | | | | | | | | | | | | | * -reduce-relocations is already specified in qt4.inc, no need to add it in qt-${PV}.inc * Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it through other inc files. * Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in qt4.inc rather than qt-${PV}.inc; these have been supported since at least 4.5.2 and therefore shouldn't be version-specific. * Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc rather than the versioned recipes for the same reason * Remove redundant setting of LICENSE in qt4-embedded.inc (From OE-Core rev: c9f714062c1100cedbcb2c16d16656e3f5442133) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix sed to have correct *.pc filesEric Bénard2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | it seems sed doesn't handle \? properly if the string in not between quotes. without this patch, we get something like (for example for QtDBusE.pc : Libs: -L${libdir} -lQtDBusE Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/ usr/lib -L/usr/lib -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board /usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} with the patch we get what is expected : Libs: -L${libdir} -lQtDBusE Libs.private: -lQtXmlE -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} (From OE-Core rev: 2e635b4fe6be9d5bfcdd837a523833b7eb0819a0) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-embedded: move qt4-embedded-conf from RDEPENDS to RRECOMMENDSJames Limbouris2011-10-041-2/+2
| | | | | | | | | | | qt4-embedded-conf contains an environment setup script for profile.d. It has been packaged seperately to allow for its exclusion, but this is only practical if it is added to RRECOMMENDS, rather than RDEPENDS. (From OE-Core rev: e0c2a62fcadc5095729229e83975f35fe0c3fa8f) Signed-off-by: James Limbouris <james@digitalmatter.com.au> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: packaging fixupDmitry Eremin-Solenikov2011-10-041-1/+1
| | | | | | | | | | | | | Improve packaging: * Add phrasebook packages to DYNAMIC_PACKAGES * Correct phrasebook packages generation * Include more files into -dbg packages * Package fontdir and fonts README. (From OE-Core rev: 4e3c29dd90f583cafe7a7fc863efb3720096d67b) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Fix translation supportOtavio Salvador2011-10-041-1/+1
| | | | | | | | | | | The translation support was disable in build. The fix-translation.patch was imported from OpenEmbedded to fix a linking issue in phonon translation support. (From OE-Core rev: 8d5a5d78f9e83c64ebddcecd7c4fd89cc1264163) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: Remove the optional documentation package from the demo's RRECOMMENDSDenis Carikli2011-10-041-1/+1
| | | | | | | | | The documentation is 285M and doesn't fit on the NAND of many machines. (From OE-Core rev: 64d6a6ceceb1f1a599b8140f30071f8bc8e60393) Signed-off-by: Denis Carikli <denis@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-embedded: move qte.sh profile script into own packageSimon Busch2011-09-281-2/+6
| | | | | | | | | | | | We don't want to pull the whole qt suite in our images when only installing a tiny setup which needs the profile script for several configuration issues. This moves the qte.sh profile script into a qt4-embedded-conf package which is automatically installed when an image depends on qt4-embedded. (From OE-Core rev: bed68b561056e0f454c0bf527997f82b63122773) Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: qt4: fix postprocessing of pkg-config filesSimon Busch2011-09-281-1/+1
| | | | | | | | | | | | | When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong. The Cflags variable contains something like ${includedir}/qtopia/QtCore where ${includedir} is already /usr/include/qtopia/QtCore. This patch reverts the fix up of the Cflags variable implemented in do_install. (From OE-Core rev: b40b9c024be5e1ec81a31961158b3e6b529acfe0) Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add blacklist-diginotar-certs patchEric Bénard2011-09-151-1/+1
| | | | | | | | | | | - this patch comes from Nokia and blacklist all DigiNotar intermediates and root certificates, more details are available here : http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/ (From OE-Core rev: abf51c33aba51782246a9136dddb53893216f518) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: package QML plugins and correct their install directoryPaul Eggleton2011-08-151-1/+1
| | | | | | | | | | | | | | | | | | QML components from Qt were installed to ${prefix} before and never got packaged. This is now fixed and QML components are now installed into ${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins package. Additionally qmlviewer and the examples/demos are now dependent upon these plugins as needed. Originally based on OE commit 4adf97be8c5b5f71ad92095a19968af534baa9e2 by Simon Busch <morphis@gravedo.de> (From OE-Core rev: 49c43e2bea64f70a22a2741ea280bd1c13e5110a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Rename SITEINFO_ENDIANESS to SITEINFO_ENDIANNESSKhem Raj2011-07-261-1/+1
| | | | | | | | | | | | | There is this discrepency in spelling. Lets fix it in core. There are lot of layers using SITEINFO_ENDIANNESS This was shielded since meta-oe had its own copy of siteinfo class. But that class has now been deleted in favor of oe-core (From OE-Core rev: 54a54778fad39931ac7d43daaf37ce7c1946a29b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: ensure target packages don't include host binariesPaul Eggleton2011-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove uic, rcc, moc and lrelease from packaged files. This fixes the following QA warnings: qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg, ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/uic qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg, ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/rcc qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg, ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/moc qt4-x11-free-4.7.3, wrong architecture, qt4-tools, ${WORKDIR}/packages-split/qt4-tools/usr/bin/uic qt4-x11-free-4.7.3, wrong architecture, qt4-tools, ${WORKDIR}/packages-split/qt4-tools/usr/bin/rcc qt4-x11-free-4.7.3, wrong architecture, qt4-tools, ${WORKDIR}/packages-split/qt4-tools/usr/bin/moc qt4-x11-free-4.7.3, wrong architecture, qt4-linguist, ${WORKDIR}/packages-split/qt4-linguist/usr/bin/lrelease These utilities are all provided by qt4-tools-nativesdk in any case. (From OE-Core rev: 69eeb3d2276e5b10d084b47d308ecfc8daf8b467) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Drop PRIORITY variableRichard Purdie2011-07-011-1/+0
| | | | | | | | | | | | | | | | As discussed on the mailing list, this variable isn't useful and if wanted would be better implemented by distros using pn-X overrides. This patch executes: find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d' against the tree removing the referenced. Thanks to Phil Blundell for the command. (From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add qt4-embedded 4.6.3 from meta-openembeddedPaul Eggleton2011-02-011-0/+34
Changes from the meta-openembedded version: * Change the order of includes so that embedded takes precedence (ensuring SRC_URI additions from qt-embedded.inc work) * Specify -embedded in qt-embedded.inc * Remove SRC_URI and S which should come from qt-${PV}.inc * Remove QT_DIR_NAME and QT_LIBINFIX as these come from qt4e.bbclass * Correct LICENSE * Set DESCRIPTION instead of SUMMARY as SUMMARY will inherit by default * Add qthelp-lib-qtclucene.patch (required to build) * Whitespace fixes Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>