summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* qmmp: update 0.6.1Kang Kai2012-07-261-4/+4
| | | | | | | | | | | Update qmmp to 0.6.1 Remove spaces at end of lines. (From OE-Core rev: 66dcf21fb3e3249c6e04fdae3eb0400c2ae7d13f) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove a number of unneeded import os/bb callsRichard Purdie2012-07-192-4/+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-192-61/+61
| | | | | | (From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4e-demo-image: new descriptionValentin Popa2012-06-291-1/+1
| | | | | | | | | | | (-) replaced qt4e-demo-image description [YOCTO #2636] (From OE-Core rev: 5a06c7d357cd08d9c6392a72e9581e3c6b6f75fc) Signed-off-by: Valentin Popa <valentin.popa@intel.com> 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>
* core-image-gtk-directfb, qt4e-demo-image: Remove module-init-tools from ↵Laurentiu Palcu2012-06-181-2/+1
| | | | | | | | | | | | | | | | | IMAGE_INSTALL list As module-init-tools package does not exist anymore there's no reason to have it in the IMAGE_INSTALL package list. If RPM package manager is used, build will fail with: Unable to find package module-init-tools (module-init-tools)! [Yocto #2580] (From OE-Core rev: 85d612737d050d4633013c706d9ad6b8169814af) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> 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>
* fotowall: Add #include ui_wizard.h to ExportWizard.cppAndrei Gherzan2012-05-162-2/+22
| | | | | | | | | | | | App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one should be already generated before compiling ExportWizard.cpp. [YOCTO #2297] (From OE-Core rev: 2cf6e7cf81c0b864b5d51be60094a6eb3e584383) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-graphics-system: set graphic system in profile instead of X11 sessionOtavio Salvador2012-05-091-7/+5
| | | | | | | | | | | | To allow the use of Qt applications started manually to use the configured graphics system the setting needs to be available in user environment. This moves the setting to /etc/profile.d ensuring it is set and available. This allow the removal of x11-common as dependency. (From OE-Core rev: 3804784b6200f82f5d8d6f533ce5e1a36ee2aeac) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 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>
* Hob: Modify Image DescriptionsElizabeth Flanagan2012-04-061-0/+1
| | | | | | | | | | | Fixes [YOCTO #2227] I've updated the image descriptions per the bug description. (From OE-Core rev: 479b020edbc609c3ae1e3846e9e0d1643ac10059) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> 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-052-13/+13
| | | | | | | | 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-053-5/+5
| | | | | | | | | | | | 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>
* quicky: Fix for multilibZhai Edwin2012-02-221-1/+1
| | | | | | | (From OE-Core rev: 1be7873cec6630ddb485590a8473e04cfb224615) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 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>
* classes,recipes: Replace POKY_* with CORE_IMAGE_*Khem Raj2012-02-081-1/+1
| | | | | | | (From OE-Core rev: b14a92f4450bb08b9f11d3fd7a99155315527cdd) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk-4.8.0: fix buildEric Bénard2012-02-014-4/+27
| | | | | | | | | | the build is actually failing because host g++ and ld are used to compile and link (From OE-Core rev: 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add LICENSE_FLAGS to packages mentioned in COMMERCIAL_LICENSETom Zanussi2012-01-241-0/+1
| | | | | | | | | | | | | | | | | | | Per-recipe LICENSE_FLAGS replace the global COMMERCIAL_LICENSE list; add LICENSE_FLAGS varables to each the recipes mentioned in that list: - lame - gst-fluendo-mp3 - gst-openmax - gst-plugins-ugly - libmad - libomxil - mpeg2dec - qmmp (From OE-Core rev: 43410523a07d9eb52a7d57ae3dc1cc320cbbc6f9) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclassOtavio Salvador2012-01-061-2/+1
| | | | | | | (From OE-Core rev: 73fc8f706b08ec74087754eacd2257856fe829d1) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 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-graphics-system: addOtavio Salvador2012-01-061-0/+27
| | | | | | | | | | | | | | Allow setting default runtime graphics system engine for Qt4 applications per machine. Depending on the GPU and Xorg driver, this can boost and impact significantly the drawing performance. The default setting is to 'raster' as this offer best performance for most machines GPUs. (From OE-Core rev: ddd3f453e93e460d8db0fcdd04fb4633fe2ebceb) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add Upstream-Status to recently added qt-4.8.0 patchPaul Eggleton2012-01-051-0/+2
| | | | | | | | | Add Upstream-Status to qmake_cxx_eval.patch. (From OE-Core rev: f4bed494ab3b3047aad45ff31efcfd59b90e3822) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add version 4.8.0Paul Eggleton2012-01-0414-6/+382
| | | | | | | | | | | | | | | | | | | | | | | Version 4.8.0 makes a few minor changes in the internal build system - the following issues had to be worked around: * The -qt-gif configure option has been removed. This is actually the default and has been for some time, so remove it from qt4.inc. * The mkspecs have been refactored requiring us to copy our g++.conf file over the top of g++-unix.conf instead. Some modifications to this file were also necessary to remove some settings that are now in other conf files (and we don't modify those values in any case). * The LD environment variable needs to be unset during configure, or else the configure script overrides our value of QMAKE_LINK which selects ${CXX} as our linker. * QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure script does not expect and cannot expand and this results in webkit being disabled, so add a workaround for this. (From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix incorrect architecture for qt4 toolsPaul Eggleton2012-01-043-6/+2
| | | | | | | | | | | | | | | | | Don't install the native staging versions of the qt4 tools in the bin directory; we have been doing this for a very long time but it is no longer necessary since we specify them via the QMAKE_UIC, QMAKE_MOC etc. variables. Doing so was sometimes resulting in those executables being the ones that end up being packaged (probably only sometimes due to different date/time values on the staging files and the interaction with make). Fixes [YOCTO #1856]. (From OE-Core rev: dc154d698b3b455a35b65935f7f04a3b4f72f8b6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Patch Upstream Status UpdatesSaul Wold2011-12-151-0/+2
| | | | | | | (From OE-Core rev: 0eb139619301d0efee330932eba3617dcb39284e) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility: Fix QA error for debug filesSaul Wold2011-12-151-4/+5
| | | | | | | | RP: Add PR bump (From OE-Core rev: 54b91b6b1ac67ce2259fa82c0e0f7d26577ba935) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: use armv6 override instead of armv6-vfpMartin Jansa2011-12-132-4/+4
| | | | | | | (From OE-Core rev: e093d550fa86d2c2d46b0df760d8a967b3366389) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 23:20:01 +0000