summaryrefslogtreecommitdiff
path: root/meta/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* 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] Signed-off-by: Saul Wold <sgw@linux.intel.com>
* 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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* 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 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' 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. Signed-off-by: Andreas Oberritter <obi@opendreambox.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. 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 Signed-off-by: Andreas Oberritter <obi@opendreambox.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 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* 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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* 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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* 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] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* 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. 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
| | | | | 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
| | | | | 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-071-1/+1
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* 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 Signed-off-by: Eric Bénard <eric@eukrea.com>
* 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 Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
* qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclassOtavio Salvador2012-01-061-2/+1
| | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclassOtavio Salvador2012-01-061-2/+1
| | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* 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. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* 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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* 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. 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]. 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
| | | | Signed-off-by: Saul Wold <sgw@linux.intel.com>
* qt-mobility: Fix QA error for debug filesSaul Wold2011-12-151-4/+5
| | | | | | RP: Add PR bump 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
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt4.inc : Add uic, moc, rcc, and lrelease to tools package.Philip Balister2011-12-133-9/+4
| | | | | | | | | | | | | | | | | 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>
* qt4: various tidy-upsPaul Eggleton2011-12-086-11/+10
| | | | | | | | | | | | | | | * -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>
* qt4: fix debug symbol strippingPaul Eggleton2011-12-084-2/+26
| | | | | | | | Adds a patch imported from Debian to not strip the executables as part of the Qt build process. This fixes the warnings shown at packaging stage as well as the content of the debug symbol packages. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* qt-mobility: Add missing patchRichard Purdie2011-11-291-0/+32
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: qt-mobility: fix QML video player crashAnatolij Gustschin2011-11-291-1/+4
| | | | | | | | Fix QML video player crash which happens when attempting to play OGG video files. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix sed to have correct *.pc filesEric Bénard2011-11-293-7/+7
| | | | | | | | | | | | | | | | | | | | 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>
* getVar/setVar cleanupsRichard Purdie2011-11-261-12/+12
| | | | | | | Complete the bb.data.getVar/setVar replacements with accesses directly to the data store object. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: bring back pkg-config fixupsSimon Busch2011-11-151-1/+15
| | | | | | | | | | | | | * 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>
* qt-mobility: qa_configure stage failedDmitry Cherukhin2011-11-112-1/+19
| | | | | | The catalogue /usr/lib removed from Makefiles used for building configure tests. Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
* Convert to use direct access to the data store (instead of bb.data.*Var*())Richard Purdie2011-11-102-13/+13
| | | | | | | | | | | | | | | This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qmmp: update to 0.5.2Xiaofeng Yan2011-11-082-47/+54
| | | | | | | | | | | | | | qmmp: remove old recipe and add new recipe Use do_split_package for each grouping and name them correctly besides updating package. The format to name plugins of qmmp: qmmp-plugin-<group>-<library> with the Description: Qmmp<Group> plugin for %s" Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Fix dESCRIPTION -> DESCRIPTION Signed-off-by: Saul Wold <sgw@linux.intel.com>
* fotowall: disable videocapture since we do not have a webcamSaul Wold2011-11-071-1/+3
| | | | Signed-off-by: Saul Wold <sgw@linux.intel.com>
* qt4: Added support for QtMobility 1.2Dmitry Cherukhin2011-10-173-0/+83
| | | | | | | | | | | | | | | The QtMobility is a Qt add-on which allows to include standard mobile functionality to Qt applications. For details, see http://qt.nokia.com/products/qt-addons/mobility/ The patch is intended to add support for the QtMobility 1.2 package to OE. Added two recipes: 1) qt-mobility-x11 builds the QtMobility 1.2 package on the basis of Qt/X11 using the qt4-x11-free package; 2) qt-mobility-embedded builds the QtMobility 1.2 package on the basis of Qt/Embedded using the qt4-embedded package. Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
* qt4: use 4.7.4 as default preferenceOtavio Salvador2011-10-144-6/+0
| | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.Wenzong Fan2011-10-141-5/+5
| | | | | | | | | | | | [YOCTO #1671] qt4-x11-free's recipe includes a sed script to sanitize it's .prl files, which are used by qmake to generate a list of libs and includes in the Makefiles it generates. It however, fails to take into account the possibility of trailing slashes, and thus leaves them in, and breaks gcc's syntax. Update these regexes to account for them. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
* qt4: Drop old version 4.7.3Richard Purdie2011-10-1210-341/+0
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-demo-init/linux-firmware/adt-installer: Convert to Use allarch class fileRichard Purdie2011-10-101-3/+1
| | | | 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. Signed-off-by: James Limbouris <james@digitalmatter.com.au> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: packaging fixupDmitry Eremin-Solenikov2011-10-043-7/+10
| | | | | | | | | | | 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>
* qt4: Fix translation supportOtavio Salvador2011-10-044-7/+38
| | | | | | | | | | | | The translation support was disable in build. The fix-translation.patch was imported from OpenEmbedded to fix a linking issue in phonon translation support. [Dmitry Eremin-Solenikov: ported to apply to qt 4.7.4 build, bumped PR] Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Update to latest version 4.7.4Eric Bénard2011-10-0410-0/+376
| | | | | | | | | | | | | - 4.7.4 was release on the 1st of september, the changelog is available here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4 and mostly contains bug fix. - this patch include the fix for QTBUG-20925 which was a regression against 4.7.3 : https://bugreports.qt.nokia.com/browse/QTBUG-20925 http://qt.gitorious.org/qt/qt/commit/852abfca6f4c349dce9b895956922f96d82df579 thanks to Paul Eggleton to point us to this bug. Signed-off-by: Eric Bénard <eric@eukrea.com>
* qt4: Fix translation supportOtavio Salvador2011-10-046-9/+40
| | | | | | | | 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>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-03 16:27:33 +0000