summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
Commit message (Collapse)AuthorAgeFilesLines
* nativesdk-qt4-tools: fix DEPENDS, as nativesdk is now prefixedDenys Dmytriyenko2013-02-141-2/+2
| | | | | | | (From OE-Core rev: 448511caae7ef7bc773bd32816901359bd820419) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Avoid circular dependencies with multilibRichard Purdie2012-10-032-0/+2
| | | | | | | | | Without this, circular dependencies are found when attempting to build multilib versions of qt4 (or bitbake world in a multilib enabled build). (From OE-Core rev: b2e8cc5ae227656211fb7f32260e7dc4e2fb556e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add 4.8.3 version with negative D_PMartin Jansa2012-10-0228-0/+1309
| | | | | | | | | | | | | * rebased patches, 3 patches are resolved upstream: 0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b 0022-webkit-fix-conflicting-types.patch resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1 (From OE-Core rev: b9fc4928bb93ad720c47920db3869d860c531d0a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: PR bumpsMartin Jansa2012-10-025-5/+5
| | | | | | | | | * sofar only formal changes, but to test that everything still builds the same (From OE-Core rev: 054a0e6c850f92c03fbb6314702de4e6318ccd25) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: replace all local patches with git patches with headersMartin Jansa2012-10-0234-388/+589
| | | | | | | | | * in preparation for upgrade to 4.8.3 (From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: drop patches not used in any recipeMartin Jansa2012-10-024-191/+0
| | | | | | | (From OE-Core rev: 5f0684c1d23a3520095a4d450a0c1fa95fa1c7b2) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: move patches from files to qt4-4.8.1Martin Jansa2012-10-0215-0/+0
| | | | | | | | | * faster lookup in FILESPATH as small bonus (From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility: move qt-mobility patches to separate dirMartin Jansa2012-10-026-0/+1
| | | | | | | (From OE-Core rev: 8dccc55a623f0c5f3469c7cdf63aa788683aa186) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: move more options to separate variablesMartin Jansa2012-10-021-3/+16
| | | | | | | | | | * make it easier to override them in bbappend * convert pulseaudio to more common -pulseaudio/-no-pulseaudio form (From OE-Core rev: 34e3687394c6fa18ef0443d63b8d7d0a68c441e0) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bbMartin Jansa2012-10-0219-5/+5
| | | | | | | (From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: use releases.qt-project.org instead of get.qt.nokia.comMartin Jansa2012-10-023-3/+3
| | | | | | | | | * releases.qt-project.org has 4.8.1 as well as 4.8.3 (From OE-Core rev: f12df439b893c70a8cd271ff8b8e6d760b78a2b3) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.incMartin Jansa2012-10-022-1/+1
| | | | | | | (From OE-Core rev: 11970283424f213f870ba7e96d70bd507b10bc63) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Update qt4.inc to remove staticdev deps in -dbg packagesMark Hatle2012-09-123-3/+3
| | | | | | | | | | | | 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. (From OE-Core rev: a7c5cec5fc63b4a26d84673460426b35669068dc) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nativesdk: Switch to using nativesdk as a prefix, not a suffixRichard Purdie2012-09-022-1/+1
| | | | | | | | | | | | | | | As discussed on the mailing lists, using a suffix to package names is hard and has lead to many recipes having to do PKGSUFFIX games. Its looking extremely hard to scale nativesdk much further without hacking many recipes. By comparison, using a prefix like multilib does works much better and doesn't involve "hacking" as many recipes. This change converts nativesdk to use a prefix using the existing multilib infrastructure. (From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-native: fix creating /include directory in build host rootMartin Jansa2012-08-061-1/+2
| | | | | | | | | | | * same fix as http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2 is needed for native too (From OE-Core rev: 7f7f42769cfae509ca5366715d2d4fd9ef5c4784) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix qt4-native build failure on SLED-11Wenzong Fan2012-08-022-2/+41
| | | | | | | | | | | | | | | | | | This issue is that with C++ compiler process an old version of kernel header file, coincidently that file has a variable named 'new': * 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h'; * '/usr/include/linux/vt.h' has below code on SLED-11.x: + unsigned int new; On mostly hosts it has been changed to: new -> newev. [YOCTO #2845] (From OE-Core rev: bb4b71552da0d1f4396955f35db5819f88a7d2ae) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: make font packaging specific to embedded versionPaul Eggleton2012-07-312-24/+31
| | | | | | | | | | | | | | | 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 (From OE-Core rev: 64369219e3e03cacfaef8df6e3eec507140bdd7d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: allow recipes building commercial editionPaul Eggleton2012-07-313-3/+9
| | | | | | | | | | | | | | | | | | | | | | | 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]. (From OE-Core rev: 2be0058fc4acddab611637656183accd052b40eb) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility, xserver-xorg, ofono, bluez4, gst-plugins-good: bump PR to ↵Martin Jansa2012-07-291-1/+1
| | | | | | | | | | | rebuild after libudev0 soname change to libudev1 * this patch depends on http://patchwork.openembedded.org/patch/32085/ (From OE-Core rev: 2792569605b50bdad8b2b8398c823dd08006daf1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove a number of unneeded import os/bb callsRichard Purdie2012-07-191-3/+1
| | | | | | | | | | The bb and os modules are always imported so having these extra import calls are a waste of space/execution time. They also set a bad example for people copy and pasting code so clean them up. (From OE-Core rev: 7d674820958be3a7051ea619effe1a6061d9cbe2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert tab indentation in python functions into four-spaceRichard Purdie2012-07-191-50/+50
| | | | | | (From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGSAnders Darander2012-06-181-1/+1
| | | | | | | | | | | | 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. (From OE-Core rev: abd5d5a712686a379a1a1da29d78a0f374f13e33) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Drop 4.7.4Richard Purdie2012-06-1214-517/+0
| | | | | | | | We have 4.8.1 now and 4.7.4 is obsolete. (From OE-Core rev: cb945328fe019c246c520904c02ca29d3798df07) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: move functions from python to shell styleDongxiao Xu2012-05-085-26/+24
| | | | | | | | | | | | | | | | | 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] (From OE-Core rev: 977ba301a1063a84b865ddf7367c35827fbffc86) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-4.8.1: fix creating /include directory in build host rootMartin Jansa2012-05-034-2/+22
| | | | | | | (From OE-Core rev: 7d3fd68480d54a8ef0d91a772df3506cd45ef2c2) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix compilation issueNitin A Kamble2012-05-033-1/+31
| | | | | | | | | | | | | | | | 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 (From OE-Core rev: 1923455340fca5e4b68a2c3ac3566a99baa93cd9) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Fix a couple of missing Upstream-StatusSaul Wold2012-05-011-0/+2
| | | | | | | (From OE-Core rev: 7555519e4878380c106f120e48aaa971bb6ac00f) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-4.8.1: Fix compile failures on qemux86Richard Purdie2012-04-306-4/+55
| | | | | | (From OE-Core rev: b8dc9182ed8959ce5a6aa285c3c7f78df2432ac3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Make 4.8.1 the default versionRichard Purdie2012-04-304-8/+0
| | | | | | (From OE-Core rev: 35aea9a7e7709217a051a72252a2893b68b6d178) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Add missing patch headersRichard Purdie2012-04-302-0/+8
| | | | | | (From OE-Core rev: ec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Qt 4.8 GCC 4.7 fixesKen Werner2012-04-304-1/+60
| | | | | | | | | | | | 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. (From OE-Core rev: c98d60923b84bcd285644cecaed1fa0455747a2f) Signed-off-by: Ken Werner <ken.werner@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: enable -accessibility and -smRobert Yang2012-04-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | 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. (From OE-Core rev: 678973a9ad258b466295a666cbcd56df15a57c7c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: move from 4.8.0 to 4.8.1Andreas Oberritter2012-04-2616-16/+16
| | | | | | | | | | * No changes other than source checksums and PR at recipe level. * DEFAULT_PREFERENCE still set to -1 (From OE-Core rev: 6a21cf0068234152b3f13866dc7c05adc6d0d9c9) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-4.7.4: Fix build with gcc 4.7Khem Raj2012-04-044-2/+70
| | | | | | | | | | | g++ 4.7 is detecting inheritence problems which we solve by explictly specifying elements in constructors (From OE-Core rev: 553ac1bf0ebf2ecf4e45ace4016b50c810ef7b26) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility: Fix build with gcc 4.7Khem Raj2012-04-042-2/+52
| | | | | | | | | | C getpid needs unistd.h for getting its signature (From OE-Core rev: da89bb83298eaf28faebcc8782f207927fbe190a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility: fix build in the absence of openglCiprian Ciubotariu2012-03-192-2/+39
| | | | | | | | | | | | QMake pro files don't explicitly define QT_NO_OPENGL if the configuration lacks opengl, but example code relies on this define. [rebased to current code - sgw] (From OE-Core rev: 4ca9ecbdd60f99101b0f6d9fadeb431b3790010a) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add RPROVIDES/RREPLACES for qmake2 recipePaul Eggleton2012-03-193-2/+5
| | | | | | | | | | | | 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>
* qt-mobility: fix QA warningsPaul Eggleton2012-03-162-2/+31
| | | | | | | | | | | | Fix the following warnings: WARNING: QA Issue: package qt-mobility-x11 contains bad RPATH /home/user/qt/lib:/home/user/qt/lib${WORKDIR}/qt-mobility-opensource-src-1.2.0/lib:/home/user/qt/lib/media/large/tmp/sysroots/qemux86/usr/lib:/home/user/qt/lib/usr/lib in file ${WORKDIR}/packages-split/qt-mobility-x11/usr/bin/qt4/examples/QtMobility/qml_device WARNING: QA Issue: package qt-mobility-x11 contains bad RPATH /home/user/qt/lib:/home/user/qt/lib${WORKDIR}/qt-mobility-opensource-src-1.2.0/lib:/home/user/qt/lib/media/large/tmp/sysroots/qemux86/usr/lib:/home/user/qt/lib/usr/lib in file ${WORKDIR}/packages-split/qt-mobility-x11/usr/bin/qt4/examples/QtMobility/qml_device (From OE-Core rev: de5a8e843d85b4d08cc5b75ec10709e96a709a90) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: package static libraries correctly to fix warningsSaul Wold2012-03-152-4/+17
| | | | | | | | | | 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' (From OE-Core rev: d4f1ef6b8297826230a68e535098709d07de1f48) 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>
* qt4: fix deps in libQtWebkit.la and QtWebKit.pcAndreas Oberritter2012-03-133-2/+3
| | | | | | | | | | | | | * 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>
* meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)Richard Purdie2012-03-051-11/+11
| | | | | | | | sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)Richard Purdie2012-03-052-4/+4
| | | | | | | | | | | | Using "1" with getVar is bad coding style and "True" is preferred. This patch is a sed over the meta directory of the form: sed \ -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \ -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \ -i `grep -ril getVar *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: make pulseaudio support conditional upon DISTRO_FEATURESPaul Eggleton2012-03-025-0/+94
| | | | | | | | | | | | | | Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in phonon within Qt4 if it is not present; otherwise it is a race condition as to whether it is enabled or disabled or breaks the build. Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving existing distro configurations unaffected. (From OE-Core rev: b82c216c1ee8e2a009e87856b7adad08f7f50482) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: depend on tiffAndreas Oberritter2012-02-283-4/+4
| | | | | | | | | | | * 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-tools-nativesdk: improve and tidy up qmake buildPaul Eggleton2012-02-283-28/+15
| | | | | | | | | | | | | * Use the same method to build qmake as in the qt4 target recipes * We always have qmake from qt4-native so don't check if it exists - just skip the check like we do in the qt4 target recipes. This saves us a patch. * Replace qt4-tools-native in DEPENDS with qt4-native (From OE-Core rev: 71153270466352245fe2aa3318bbabb1f8062ed2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: fix build of 4.7.4Paul Eggleton2012-02-281-4/+7
| | | | | | | | | | | Commit 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc introduced a sed command line to modify a file that only exists in 4.8.0, thus do_configure of 4.7.4 was failing; so make this conditional upon the file existing. (From OE-Core rev: 0b948d20b835387702a4f5e103eaae5b4a330edd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: build qmake for the targetPaul Eggleton2012-02-287-26/+126
| | | | | | | | | | | | | | | | | | | | | | | qmake was not being built at all (since we had the host version from qt4-native) and the default is to build for the host machine within configure. With a minor hack we can build qmake for the target as well, which is useful if you want to build Qt 4 software on an actual device. This is now installed as part of the tools package (together with uic, moc etc.) Additionally, add an environment setup script (installed in /usr/share/qt4/environment-setup or /usr/share/qtopia/environment-setup for the embedded version) as part of the mkspecs package since the mkspecs will not work without the paths set up by this script. The code to create this script was adapted from the qmake2 recipe in meta-oe. Also move do_compile() from qt-${PV}.inc up to qt4.inc as both versions have the exact same content. (From OE-Core rev: 4306606489a2d922595d4c86a21c496bbd8a607e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix compile error in Qt 4.8.0 with gcc 4.6Paul Eggleton2012-02-283-1/+33
| | | | | | | | | | | | Ensure the Qt configure script can can detect the compiler correctly as g++. This fixes the following compile error with gcc 4.6: ./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] (From OE-Core rev: f29bb5b2a99ecef46e5570bf3336e9680c0b6705) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-native: set headerdir as done in regular buildsOtavio Salvador2012-02-261-1/+2
| | | | | | | | | | | qmake uses a generated qt.conf file that expects headers to be found at ${includedir}/qt4 but qt4-native were not following this layout breaking the builds of native binaries that use qt4. (From OE-Core rev: 7828bf71babd965b263249f4a24ecfe58e97cc0b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipes: bump PR to rebuild .la files without libz.laMartin Jansa2012-02-211-1/+1
| | | | | | | (From OE-Core rev: 1da6a2dbd5e7aeea6cd45ca05590bdd50b67bf89) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>