summaryrefslogtreecommitdiff
path: root/meta/recipes-qt
AgeCommit message (Collapse)AuthorFiles
2013-06-10qt4: fix QMAKE_QT_CONFIG being overwritten with empty valueJonathan Liu2
QMAKE_QT_CONFIG is set by the linux-oe-g++ mkspec but it is overwritten with an empty value read from .qmake.cache. Avoid this by first checking if the value from .qmake.cache is not empty before assigning it to QMAKE_QT_CONFIG. This allows variables from qconfig.pri such as QT_ARCH, QT_CONFIG, QT_VERSION, etc. to be queried by qmake projects. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10qt4-native: update configure paths to match targetJonathan Liu1
qmake2 was being built with paths different to the target Qt. The incorrect paths can be seen by running qmake2 -query: QT_INSTALL_DOCS:${STAGING_DIR_NATIVE}/usr/doc should be /usr/share/doc/qt4 QT_INSTALL_PLUGINS:${STAGING_DIR_NATIVE}/usr/plugins should be /usr/lib/qt4/plugins QT_INSTALL_IMPORTS:${STAGING_DIR_NATIVE}/usr/imports should be /usr/lib/qt4/imports QT_INSTALL_TRANSLATIONS:${STAGING_DIR_NATIVE}/usr/translations should be /usr/share/qt4/translations QT_INSTALL_EXAMPLES:${STAGING_DIR_NATIVE}/usr/examples should be /usr/bin/qt4/examples QT_INSTALL_DEMOS:${STAGING_DIR_NATIVE}/usr/demos should be /usr/bin/qt4/demos QMAKE_MKSPECS:${STAGING_DIR_NATIVE}/usr/mkspecs should be /usr/share/qt4/mkspecs Use the same paths as target Qt for consistency. As the mkspecs are installed to /usr/share/qt4/mkspecs not /usr/mkspecs, qmake2 was unable to detect and load the webkit module (it is detected by loading modules/qt_*.pri inside the mkspecs directory) so webkit was missing from QT_CONFIG if a qmake project reads the QT_CONFIG variable. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10qt4-native: build lconvert and xmlpatternsJonathan Liu1
These tools are needed by some Qt projects (e.g. Qt Creator). Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
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-06-10qt4-native: update HOMEPAGEJonathan Liu1
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10qt4-embedded: update HOMEPAGEJonathan Liu1
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10qt-mobility: update HOMEPAGEJonathan Liu1
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10nativesdk-qt4-tools.inc: update HOMEPAGEJonathan Liu1
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-30qt4: fix path to demos documentationJonathan Liu1
The qt4-demos-doc package is not created when building qt4-x11-free because ${docdir}/qtopia/qch/qt.qch doesn't exist. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-21qt: fix warning -Wunused-local-typedefs introduced by gcc 4.8Andreas Müller5
in meta-oe maliit-framework failed with | In file included from /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/QtCore:53:0, | from ../utils/core-utils.cpp:18: | /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/qtconcurrentfilter.h: In function 'QtConcurrent::ThreadEngineStarter<void> QtConcurrent::filterInternal(Sequence&, KeepFunctor, Redu | /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/qtconcurrentfilter.h:108:47: error: typedef 'Iterator' locally defined but not used [-Werror=unused-local-typedefs] | typedef typename Sequence::const_iterator Iterator; | ^ | cc1plus: all warnings being treated as errors Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09qt4: remove trailing slash from prefixPaul Barker1
The trailing slashs on "Prefix=${prefix}/" and "-prefix ${prefix}/" are passed through to the generated pkgconfig files and may be joined to paths like "/include" yielding a final path with a double forward-slash (eg. "/usr//include"). This may end up in the debugging symbols in other applications or libraries which depend on qt4 which in turn causes the debugedit program to fail with the message "canonicalization unexpectedly shrank by one character" when it tries to replace the double forward-slash with a single forward-slash. Thus the function split_and_strip_files fails and ultimately do_package fails. As this slash is removed from the prefix it is added into the regular expression used to fix up pkgconfig files later in the recipe. This error was seen in vlc in meta-openembedded and should be solved by this change in openembedded-core. Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-02qt4: Fix sundry erroneous assumptions about ${prefix}Phil Blundell2
FILES_${QT_BASE_NAME}-tests was hard-coded to "/usr/tests/..." but Qt actually installs these files into ${prefix}/tests. Conversely, FILES_${PN}-dbg in qt4.inc was defined in terms of ${exec_prefix}/src, which appears commendable but doesn't actually match where package.bbclass will put the sources since the latter is hard-coded to /usr/src. This fixes a large number of "installed but not shipped" warnings when ${prefix} is set to something other than /usr. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-16qt4-embedded: 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>
2013-04-16packagegroup-qte-toolchain-target: bump PR to allow removal of meta-oe bbappendPaul Eggleton1
The meta-oe bbappend only increments PRINC, if we bump 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>
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>
2013-04-03qt-mobility: added list of modules to be compiledFelipe F. Tonello1
This is useful for users that want to .bbappend this recipe to select specific modules to be compiled. Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-03-18qt-mobility: Add pulseaudio dependency if DISTRO_FEATURES has pulseaudioFelipe F. Tonello1
Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-03-18qt-mobility: Add bluez dependency if DISTRO_FEATURES has bluetoothFelipe F. Tonello1
Some modules doesn't requires bluez4 to compile. So it's unnecessary to have it as dependency. Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-03-05qt4.inc: package keyboard driversAndreas Oberritter1
* Fixes the following packaging error, if compiled with -plugin-kbd-linuxinput: | WARNING: For recipe qt4-embedded, the following files/directories were installed but not shipped in any package: | WARNING: /usr/lib/qtopia/plugins/kbddrivers/.debug | WARNING: /usr/lib/qtopia/plugins/kbddrivers/.debug/libqlinuxinputkbddriver.so * No PR bump, because -plugin-kbd-linuxinput is not enabled by default. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-28qt4-embedded: Enable Linux Input supportOtavio Salvador1
This allow use of Linux Input directly so being able to use 'evdev' driver for keyboard use. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-02-19meta-toolchain-qt.inc: Use CXX when linkingOtavio Salvador1
We should use CXX compiler when linking objects as done in regular builds inside of OE-Core. This fixes issues we've been seeing in field where we needed to change it byhand so the toolchain could work. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-11qt4: use system SQLitePaul Eggleton1
We've always been depending on external SQLite, however by default Qt builds using its own internal copy of SQLite. Add the configure option to actually use the external SQLite library and make it clearer which version is in use. Fixes [YOCTO #2514]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-06qt4: fix CVE-2013-0254Eric Bénard4
fix "POSIX shared memory segments created world-writeable" more details : http://lists.qt-project.org/pipermail/announce/2013-February/000023.html Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-06qmmp: update to 0.6.6 and fixPaul Eggleton3
* Update to 0.6.6 * Fix compilation failure due to unconditional call to QApplication::commitData() * Disable /usr/local host paths to avoid compilation warnings * Force use of the cmake configure instead of qmake as the latter is not dynamic with Qmmp and doesn't let you disable certain dependencies (e.g. enca) * Add libsndfile1, libsamplerate0 and curl to DEPENDS since their use will be non-deterministic otherwise * Explicitly disable library-requiring options that we don't have available in OE-Core so that they don't get used if they happen to be in the sysroot * Update LIC_FILES_CHKSUM since there were cosmetic changes to the license file (mostly reformatting and change of references to LGPL from "Library" to "Lesser".) Fixes [YOCTO #3822]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-02-06nativesdk-qt4-tools: fix DEPENDS, as nativesdk is now prefixedDenys Dmytriyenko1
Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-01qt4: Add space for _appendsSaul Wold2
With out the space we get -x11-no-neon concatanted incorrectly Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-01QT4: use '-no-neon' if cpu does not support neonRoy.Li2
Some armv7a cpu does not support neon, like SPEAr1310, so we should check against "neon" in TUNE_FEATURES. Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-16add meta-toolchain-qtEric Bénard9
- this allows the creation of a SDK containing all the needed libraries to develop QT4 for X applications - the recipes were factorized to share as much code as possible - binaries generated using the toolchain were run tested on an ARMv7 target - both qt & qte toolchains were build tested for qemuarm target and for an ARMv7 target Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-01-07qt4: blacklist untrusted SSL certificatesEric Bénard5
- this blacklist wrong certificates https://bugreports.qt-project.org/browse/QTBUG-24654 https://bugreports.qt-project.org/browse/QTBUG-28937 - these patches will be in the next 4.8.5 release Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-11nativesdk-qt4-tools: fix do_configure to be reentrantMartin Jansa1
* without = it can add g++ prefix multiple time when you reexecute do_configure (e.g. after failure) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-12-11qt4: upgrade to 4.8.4Martin Jansa33
* changes in licenses are only s/Nokia/Digia/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-12-06qt4-native & ghostscript: update upstream status for their patchesChen Qi1
Update the upstream status for patches of long building path. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-12-06quicky: tidy up inheritPaul Eggleton1
* inherit qt4x11 which inherits qmake2 and sets DEPENDS already. * Remove pkgconfig from inherit since quicky doesn't actually use pkg-config nor does it produce a .pc file Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-12-05qmmp: remove qmake2 from inheritPaul Eggleton1
qt4x11 already inherits qmake2 so it doesn't need to be inherited again. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-05fotowall: tidy upPaul Eggleton1
* inherit qt4x11 which inherits qmake2 and sets DEPENDS already * Remove pkgconfig from inherit since quicky doesn't actually use pkg-config nor does it produce a .pc file * Move packaging definitions to the end Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-03qt4-native: make qt4-native work with long building pathChen Qi2
If the TMPDIR has more than 256 chars, building qt4-native fails. This violates the 410 length limit of TMPDIR. This patch makes building qt4-native succeed with a long building path (410 for example) by extending its static arrays' sizes by 256 chars. [YOCTO #2766] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-24meta-toolchain-qte: add --sysroot option to OE_QMAKE_(CC|CXX|LD)Laurentiu Palcu1
When building a QT application using OE_QMAKE_CC/OE_QMAKE_CXX, the --sysroot was not included and the compilation would fail. The user had to add the option manually which was not very user friendly. This happened only when installing the SDK in another location than the default one. Since CC/CXX/LD had this option already included, reuse them. [YOCTO #3409] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-19qt4: remove 4.8.1Ross Burton30
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-19qt4: remove negative preference on 4.8.3Ross Burton3
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.confMartin Jansa5
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-19PACKAGES_DYNAMIC: use += instead of = in most casesMartin Jansa2
* to keep ${PN}-locale from bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*" Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19PACKAGES_DYNAMIC: use regexp not globMartin Jansa3
* bitbake uses PACKAGES_DYNAMIC as regexp ^ could make matching faster (and it will be more clear that we're expecting regexp not glob) * made all those last '-' optional, use .* (or nothing) 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 Jansa2
* 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 Purdie2
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: add 4.8.3 version with negative D_PMartin Jansa28
* 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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-10-02qt4: PR bumpsMartin Jansa5
* sofar only formal changes, but to test that everything still builds the same Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-10-02qt4: replace all local patches with git patches with headersMartin Jansa34
* in preparation for upgrade to 4.8.3 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-10-02qt4: drop patches not used in any recipeMartin Jansa4
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-10-02qt4: move patches from files to qt4-4.8.1Martin Jansa15
* faster lookup in FILESPATH as small bonus Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-10-02qt-mobility: move qt-mobility patches to separate dirMartin Jansa6
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 12:51:22 +0000