summaryrefslogtreecommitdiff
path: root/meta/recipes-qt
AgeCommit message (Collapse)AuthorFiles
2012-08-06qt4-native: fix creating /include directory in build host rootMartin Jansa1
* same fix as http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2 is needed for native too Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-02qt4: fix qt4-native build failure on SLED-11Wenzong Fan2
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] Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-31qt4: make font packaging specific to embedded versionPaul Eggleton2
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 Eggleton3
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-07-29qt-mobility, xserver-xorg, ofono, bluez4, gst-plugins-good: bump PR to ↵Martin Jansa1
rebuild after libudev0 soname change to libudev1 * this patch depends on http://patchwork.openembedded.org/patch/32085/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-26qmmp: update 0.6.1Kang Kai1
Update qmmp to 0.6.1 Remove spaces at end of lines. Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-07-19Remove a number of unneeded import os/bb callsRichard Purdie2
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19Convert tab indentation in python functions into four-spaceRichard Purdie2
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-29qt4e-demo-image: new descriptionValentin Popa1
(-) replaced qt4e-demo-image description [YOCTO #2636] Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-18qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGSAnders Darander1
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-06-18core-image-gtk-directfb, qt4e-demo-image: Remove module-init-tools from ↵Laurentiu Palcu1
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] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
2012-06-12qt4: Drop 4.7.4Richard Purdie14
We have 4.8.1 now and 4.7.4 is obsolete. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-16fotowall: Add #include ui_wizard.h to ExportWizard.cppAndrei Gherzan2
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] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
2012-05-09qt4-graphics-system: set graphic system in profile instead of X11 sessionOtavio Salvador1
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. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-05-08qt4: move functions from python to shell styleDongxiao Xu5
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 Jansa4
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 Kamble3
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-05-01Fix a couple of missing Upstream-StatusSaul Wold1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-04-30qt-4.8.1: Fix compile failures on qemux86Richard Purdie6
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-27qt4: Make 4.8.1 the default versionRichard Purdie4
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-27qt4: Add missing patch headersRichard Purdie2
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-27Qt 4.8 GCC 4.7 fixesKen Werner4
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-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-04-24qt4: move from 4.8.0 to 4.8.1Andreas Oberritter16
* No changes other than source checksums and PR at recipe level. * DEFAULT_PREFERENCE still set to -1 Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-06Hob: Modify Image DescriptionsElizabeth Flanagan1
Fixes [YOCTO #2227] I've updated the image descriptions per the bug description. Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
2012-04-04qt-4.7.4: Fix build with gcc 4.7Khem Raj4
g++ 4.7 is detecting inheritence problems which we solve by explictly specifying elements in constructors Signed-off-by: Khem Raj <raj.khem@gmail.com>
2012-04-04qt-mobility: Fix build with gcc 4.7Khem Raj2
C getpid needs unistd.h for getting its signature Signed-off-by: Khem Raj <raj.khem@gmail.com>
2012-03-19qt-mobility: fix build in the absence of openglCiprian Ciubotariu2
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>
2012-03-19qt4: add RPROVIDES/RREPLACES for qmake2 recipePaul Eggleton3
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-16qt-mobility: fix QA warningsPaul Eggleton2
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>
2012-03-15qt4: package static libraries correctly to fix warningsSaul Wold2
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 Oberritter3
* 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-03-05meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)Richard Purdie2
sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)Richard Purdie3
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>
2012-03-02qt4: make pulseaudio support conditional upon DISTRO_FEATURESPaul Eggleton5
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>
2012-02-28qt4.inc: depend on tiffAndreas Oberritter3
* 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-02-28qt4-tools-nativesdk: improve and tidy up qmake buildPaul Eggleton3
* 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>
2012-02-28qt4-tools-nativesdk: fix build of 4.7.4Paul Eggleton1
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>
2012-02-28qt4: build qmake for the targetPaul Eggleton7
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>
2012-02-28qt4: fix compile error in Qt 4.8.0 with gcc 4.6Paul Eggleton3
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>
2012-02-26qt4-native: set headerdir as done in regular buildsOtavio Salvador1
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>
2012-02-22quicky: Fix for multilibZhai Edwin1
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-21recipes: bump PR to rebuild .la files without libz.laMartin Jansa1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-07classes,recipes: Replace POKY_* with CORE_IMAGE_*Khem Raj1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2012-02-01qt4-tools-nativesdk-4.8.0: fix buildEric Bénard4
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>
2012-01-24Add LICENSE_FLAGS to packages mentioned in COMMERCIAL_LICENSETom Zanussi1
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>
2012-01-06qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclassOtavio Salvador1
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-01-06qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclassOtavio Salvador1
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-01-06qt4-graphics-system: addOtavio Salvador1
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>
2012-01-05qt4: add Upstream-Status to recently added qt-4.8.0 patchPaul Eggleton1
Add Upstream-Status to qmake_cxx_eval.patch. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>