aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-embedded.inc
AgeCommit message (Collapse)Author
2013-04-16qt4-embedded: bump PR to allow removal of meta-oe bbappendPaul Eggleton
The meta-oe bbappend only increments PRINC, if we bump INC_PR here we can remove that. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-28qt4-embedded: Enable Linux Input supportOtavio Salvador
This allow use of Linux Input directly so being able to use 'evdev' driver for keyboard use. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-11-12qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.confMartin Jansa
upstream does not need GLU since: commit e7eed096a0c33607a7a37baaf06e5952dc9d556b Author: Bj<C3><B8>rn Erik Nilsen <bjorn.nilsen@nokia.com> Date: Mon Aug 9 14:07:01 2010 +0200 Remove dependency of OpenGL Utility Library (GLU). GLU is not part of standard OpenGL and is not used internally in Qt, so we should not depend on it. Task-number: QT-12227 Reviewed-by: kim Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19PACKAGES_DYNAMIC: use regexp not globMartin Jansa
* bitbake uses PACKAGES_DYNAMIC as regexp ^ could make matching faster (and it will be more clear that we're expecting regexp not glob) * made all those last '-' optional, use .* (or nothing) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18qt4: use extra variable for more QT_CONFIG_FLAGS fragmentsMartin Jansa
* qt4-embedded was forcing -DQT_KEYPAD_NAVIGATION which depends on feature-completer * separate variable makes it easier to not enable QT_KEYPAD_NAVIGATION in some upper layer where we have disabled feature-completer Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-10-03qt4: Avoid circular dependencies with multilibRichard Purdie
Without this, circular dependencies are found when attempting to build multilib versions of qt4 (or bitbake world in a multilib enabled build). Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-02qt4: PR bumpsMartin Jansa
* sofar only formal changes, but to test that everything still builds the same Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-09-12qt4: Update qt4.inc to remove staticdev deps in -dbg packagesMark Hatle
It appears that the qt4.inc had a copy/paste error relating to creating a list of staticdev packages, that caused them to show up as dependencies in the -dbg package. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-07-31qt4: make font packaging specific to embedded versionPaul Eggleton
Qt 4's lib/fonts files are intended only for installation with Qt Embedded [1] so only install and package them with the embedded version. Fixes [YOCTO #2809]. [1] http://lists.qt-project.org/pipermail/interest/2012-July/003062.html Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-31qt4: allow recipes building commercial editionPaul Eggleton
To enable building the commercial edition of Qt (through additional recipes that are *not* provided by OE-Core) we need to tweak a few things: * Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free - instead add qt4-x11 to DEPENDS and then have qt4-x11-free include this in its PROVIDES. A commercial equivalent recipe should do the same. * Add a QT_LICENSE_FILE variable that can be used to specify the license file required by the commercial edition. * Add a QT_LICENSE_FLAGS variable which the recipe can set to select the license option being used. The default of "-opensource" retains the current behaviour; a commercial recipe should set it to "-commercial". Fixes [YOCTO #2505]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-18qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGSAnders Darander
After the change to shell style functions (from python style), the ability to use oe_filter_out on QT_CONFIG_FLAGS got broken. This patch solves that by referring to QT_ARCH in a more correct way. Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-08qt4: move functions from python to shell styleDongxiao Xu
In qt4's do_configure operation, it will refer to some variables that are derived from 'd', however these variable values may be not correct in multilib case since the extraction of these variables happens before the multilib handler. The fix is to move these python style functions back to shell style. This fixes [YOCTO #2355] [RP: Fix whitepace] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03qt-4.8.1: fix creating /include directory in build host rootMartin Jansa
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-27Qt 4.8 GCC 4.7 fixesKen Werner
This change introduces two new patches to Qt 4.8. One prevents the build system from using the -fuse-ld=gold GCC flag as this isn't upstream and therefore not supported by many toolchains out there. The second patch fixes a compile time error when using toolchains based on GCC 4.7. Signed-off-by: Ken Werner <ken.werner@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19qt4: add RPROVIDES/RREPLACES for qmake2 recipePaul Eggleton
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-03-13qt4: fix deps in libQtWebkit.la and QtWebKit.pcAndreas Oberritter
* 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. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2012-02-28qt4.inc: depend on tiffAndreas Oberritter
* 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 Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2012-01-06qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclassOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2011-12-13qt4.inc : Add uic, moc, rcc, and lrelease to tools package.Philip Balister
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.) 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>
2011-12-08qt4: various tidy-upsPaul Eggleton
* -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 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-11-29qt4: fix sed to have correct *.pc filesEric Bénard
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} Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04qt4-embedded: move qt4-embedded-conf from RDEPENDS to RRECOMMENDSJames Limbouris
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. Signed-off-by: James Limbouris <james@digitalmatter.com.au> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04qt4: packaging fixupDmitry Eremin-Solenikov
Improve packaging: * Add phrasebook packages to DYNAMIC_PACKAGES * Correct phrasebook packages generation * Include more files into -dbg packages * Package fontdir and fonts README. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04qt4: Fix translation supportOtavio Salvador
The translation support was disable in build. The fix-translation.patch was imported from OpenEmbedded to fix a linking issue in phonon translation support. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2011-10-04qt4.inc: Remove the optional documentation package from the demo's RRECOMMENDSDenis Carikli
The documentation is 285M and doesn't fit on the NAND of many machines. Signed-off-by: Denis Carikli <denis@eukrea.com>
2011-09-27qt4-embedded: move qte.sh profile script into own packageSimon Busch
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. Signed-off-by: Simon Busch <morphis@gravedo.de>
2011-09-27meta: qt4: fix postprocessing of pkg-config filesSimon Busch
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. Signed-off-by: Simon Busch <morphis@gravedo.de>
2011-09-15qt4: add blacklist-diginotar-certs patchEric Bénard
- 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/ Signed-off-by: Eric Bénard <eric@eukrea.com>
2011-08-15qt4: package QML plugins and correct their install directoryPaul Eggleton
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> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-07-26meta: Rename SITEINFO_ENDIANESS to SITEINFO_ENDIANNESSKhem Raj
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 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05qt4: ensure target packages don't include host binariesPaul Eggleton
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-07-01Drop PRIORITY variableRichard Purdie
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-01qt4: add qt4-embedded 4.6.3 from meta-openembeddedPaul Eggleton
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>