summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4/qt4-x11-free.inc
AgeCommit message (Collapse)AuthorFiles
2015-05-14qt4-x11-free: make virtual/libgl dependency conditionalDmitry Eremin-Solenikov1
Make qt4-x11-free depend on virtual/libgl only if the DISTRO_FEATURES contains opengl. Otherwise there will be no package to fullfil this dependency. Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2014-04-25Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador1
The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02qt4: set SUMMARY and tweak DESCRIPTIONPaul Eggleton1
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-12-04qt4: fixed dependency on icuEnrico Scholz1
Commit 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62 added 'icu' to DEPENDS in qt4-x11 only, but enabled icu globally in qt4.inc. This breaks build of qt4-embedded because this recipe does not have such a DEPENDS but uses qt4.inc: | icu.cpp:42:28: fatal error: unicode/utypes.h: No such file or directory | #include <unicode/utypes.h> | ^ | compilation terminated. | make: *** [icu.o] Error 1 Patch moves the 'icu' dependency into qt4.inc. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-30qt4-x11-free: depend on ICURoss Burton1
ICU presence is auto-detected at configure time and until recently (e68850 and d61230) was pulled into most builds through harfbuzz and beecrypt. Now it's floating and this leads to build failures. As in all likelihood the majority of people were building this with ICU enabled, add an explicit dependency. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-26qt4-x11-free: disable QGtkStylePaul Eggleton1
This currently leads to a floating dependency on GTK+. Since most users in an embedded context won't need this, just disable it by default. Fixes [YOCTO #5116]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-10qt4-x11-free: update HOMEPAGEJonathan Liu1
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-16qt4-x11-free: bump PR to allow removal of meta-oe bbappendPaul Eggleton1
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>
2012-11-12qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.confMartin Jansa1
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-18qt4: use extra variable for more QT_CONFIG_FLAGS fragmentsMartin Jansa1
* 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 Purdie1
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 Jansa1
* 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 Hatle1
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: allow recipes building commercial editionPaul Eggleton1
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-05-08qt4: move functions from python to shell styleDongxiao Xu1
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 Jansa1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03qt4: fix compilation issueNitin A Kamble1
gcc 4.7 uncovers a type mismatch in the code. And this commit fixes the issue: | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive] | In file included from ./wtf/Platform.h:1217:0, | from ./config.h:30, | from wtf/gobject/GOwnPtr.cpp:19: | wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-24qt4-x11-free: enable -accessibility and -smRobert Yang1
Is it possible to enable the "-sm -accessibility" in oe-core, please? There is a meta-kde layer which requires the "-sm -accessibility", but they are disabled in meta/recipes-qt/qt4/qt4.inc: QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" I checked the log of the qt4, can't find the related log for "-no-accessibility -no-sm". Another way is use the bbappend, but it would be great if it can be enabled in oe-core. This only enables for qt4-x11, doesn't enable for qt4-embedded, and have done testing on: qemux86, qemuarm, qemumips, qemuppc. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2012-03-19qt4: add RPROVIDES/RREPLACES for qmake2 recipePaul Eggleton1
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-15qt4: package static libraries correctly to fix warningsSaul Wold1
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a' WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a' Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-13qt4: fix deps in libQtWebkit.la and QtWebKit.pcAndreas Oberritter1
* 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 Oberritter1
* 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-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclassOtavio Salvador1
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2011-12-13qt4.inc : Add uic, moc, rcc, and lrelease to tools package.Philip Balister1
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 Eggleton1
* -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énard1
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-11-15qt4-x11-free: bring back pkg-config fixupsSimon Busch1
* With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where removed from qt4.inc which breaks the pkg-config files for qt4-embedded. Without that the pkg-config files for qt4-x11-free are broken. So this patch puts the fixes into the qt4-x11-free.inc file to be used by qt4-x11-free and not qt4-embedded. * Resending because nobody replied on http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg10609.html Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2011-10-04qt4: packaging fixupDmitry Eremin-Solenikov1
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 Salvador1
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: package qtdemo's docs in a separate packageDenis Carikli1
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>
2011-09-27meta: qt4: fix postprocessing of pkg-config filesSimon Busch1
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énard1
- 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 Eggleton1
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 Raj1
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-07libQtOpenGL:Add libQtOpenGL to an lsb imageXiaofeng Yan1
I make "opengl" as a DISTO_FEATURE for installing libQtOpenGL to image. Fix Bug [YOCTO #1020] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05qt4: ensure target packages don't include host binariesPaul Eggleton1
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 Purdie1
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-05-04Remove machine-specific metadata for machines no longer in oe-corePaul Eggleton1
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-04-12qt4-x11-free: add virtual/libgl for opengl dependencySaul Wold1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-04-04qemuppc: add libqtopengl4 for ppcMei Lei1
Modify some configs for ppc to enable the libqtopengl4 support. This fixes [YOCTO #848] Signed-off-by: Mei Lei <lei.mei@intel.com>
2011-02-01qt4: Bring in improvements from meta-openembeddedPaul Eggleton1
Differences from meta-openembedded version: * SRC_URI and S now come from qt-${PV}.inc since these are version specific * Source checksums are also now in qt-${PV}.inc * Remove do_compile as this is handled in qt-${PV}.inc * Move contents of do_install_append from qt-${PV}.inc to do_install in qt4.inc as this is the same for 4.6.3 and 4.7.1 and will get in the way of do_install_append in qt-embedded.inc. * Don't enable PostgreSQL, MySQL or SQLite 2.x plugins as we don't currently have recipes for these DBMSs in Poky. These can be re-enabled easily when or if we do. * Use INC_PR in qt4-x11-free_4.6.3.bb * Don't always specify -embedded config option in qt4.inc * Don't add qte.sh to SRC_URI in qt-4.6.3.inc (this is embedded-specific) Differences from what we have currently in Poky (plus the above): * Set DESCRIPTION based on embedded/X11 * Move out arch-specific settings to qt4-arch.inc * Add qt4x11.bbclass which can be inherited by application recipes to select the X11 version (this makes more sense once the embedded version is added). * Update HOMEPAGE Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2010-12-10Enable '-opengl' option for qt4 in order to generate libQtOpenGL.soJingdong Lu1
qt4-x11-free: Only build opengl for x86 platforms since only these have GL support at present [sgw@linux.intel.com: merged and fixed Signed-off-bys] Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-08-27Major layout change to the packages directoryRichard Purdie1
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-05 11:14:28 +0000