summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* qt-mobility: remove /usr/lib from ld rpath-link optionRoy.Li2013-06-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | Remove /usr/lib from ld rpath-link option to fix the below build error: bitbake_build/tmp/sysroots/x86-kvm-guest/usr/lib/libpng16.so.16: undefined reference to `inflateReset2@ZLIB_1.2.3.4' since sysroot seems not work for rpath-link, and "rpath-link,/usr/lib" makes ld to search host libraries for target libraries, once host has different version zlib, the error will happen. qmake uses QT_MOBILITY_LIB to generate "rpath-link,/usr/lib" when do_configure but we can not add sysroot into QT_MOBILITY_LIB, since QT_MOBILITY_LIB is dir which libraries will be installed to, so I remove this dir from rpath-link before do_compile (From OE-Core rev: f7409a9fe83ba2535a43f39ed57cd78242a88557) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add eglibc-gconv-utf-16 to QtCore RRECOMMENDS when using glibcJonathan Liu2013-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warnings when running Qt applications: QIconvCodec::convertFromUnicode: using Latin-1 for conversion, iconv_open failed QIconvCodec::convertToUnicode: using Latin-1 for conversion, iconv_open failed Qt's QString class stores strings internally using UTF-16 encoding. The UTF-16 iconv module is needed to convert between the system's local 8-bit representation and QString's UTF-16 encoding. For example, the following functions would be affected: QString::fromLocal8Bit(...) QString::toLocal8Bit(...) If the UTF-16 iconv module couldn't be loaded, it would use Latin-1 encoding instead of the system's encoding for conversion. [YOCTO #349] (From OE-Core rev: 2e9c8007bca684149d72e96423f30433b6665fad) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: set QMAKE_COMPILER to gcc in mkspecJonathan Liu2013-06-141-0/+2
| | | | | | | | | | | This avoids the following warning when running qmake: Project WARNING: qmake spec does not announce the compiler family. Guessed gcc. (From OE-Core rev: 6c78f629323bea0be44181d60e3ce45be0416093) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: disable gdb_dwarf_indexJonathan Liu2013-06-141-0/+3
| | | | | | | | | | | | | * qmake is trying to call native gdb and we don't depend on gdb-native (or even provide gdb-native) * fixes errors like this: /bin/sh: gdb: command not found /bin/sh: line 0: test: -gt: unary operator expected (From OE-Core rev: 6456b596a73232429e0d223089f32dc350ea20b0) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix QMAKE_QT_CONFIG being overwritten with empty valueJonathan Liu2013-06-112-0/+40
| | | | | | | | | | | | | | | | 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. (From OE-Core rev: 5330905749828ea8befdee559c180754ac506b75) 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>
* qt4-native: update configure paths to match targetJonathan Liu2013-06-111-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. (From OE-Core rev: 37b57b44ff83c718021da4f717fc66a28204c96c) 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>
* qt4-native: build lconvert and xmlpatternsJonathan Liu2013-06-111-1/+3
| | | | | | | | | | These tools are needed by some Qt projects (e.g. Qt Creator). (From OE-Core rev: e2f3232fdc2836685549e59dc5c71363d3bbab5f) 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>
* qt4-x11-free: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: cf5c9ee6128cbec3bf7d74210bd968fba9ac87da) 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>
* qt4-native: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: b56ee1a32f047da288bc7b2435470609b70319fe) 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>
* qt4-embedded: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: 246d16f453466ab609861e170d0b51d7dd23e91a) 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>
* qt-mobility: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: 74fc4c0d17f72f5b59b8da6e03d3a50e8c66d76d) 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>
* nativesdk-qt4-tools.inc: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: dbd5c1fda3b477e861a979e98a4f879071bebc37) 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>
* qt4: fix path to demos documentationJonathan Liu2013-05-301-1/+1
| | | | | | | | | | | The qt4-demos-doc package is not created when building qt4-x11-free because ${docdir}/qtopia/qch/qt.qch doesn't exist. (From OE-Core rev: 3c73eeda461bf2ea23bf7969b8a8f9c574c75277) 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>
* qt: fix warning -Wunused-local-typedefs introduced by gcc 4.8Andreas Müller2013-05-215-3/+42
| | | | | | | | | | | | | | | | | | 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 (From OE-Core rev: 4cb93a42bae3dfa53880a9475a92cc046dde5767) 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>
* qt4: remove trailing slash from prefixPaul Barker2013-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | 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. (From OE-Core rev: 61a7329a5c1f0b84f447256134f5a77917f07f38) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Fix sundry erroneous assumptions about ${prefix}Phil Blundell2013-05-022-3/+3
| | | | | | | | | | | | | | | | | | | 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. (From OE-Core rev: c0cfd4f84c8f4843027332cfd6cf99c452c50dbb) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-embedded: bump PR to allow removal of meta-oe bbappendPaul Eggleton2013-04-161-1/+1
| | | | | | | | | | The meta-oe bbappend only increments PRINC, if we bump INC_PR here we can remove that. (From OE-Core rev: 9e74a1c9cb753a426b55544cc41860edb98e8d33) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-qte-toolchain-target: bump PR to allow removal of meta-oe bbappendPaul Eggleton2013-04-161-1/+1
| | | | | | | | | | The meta-oe bbappend only increments PRINC, if we bump PR here we can remove that. (From OE-Core rev: 7aadfe2f293da665236aede5cb03f801d420d050) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: bump PR to allow removal of meta-oe bbappendPaul Eggleton2013-04-161-1/+1
| | | | | | | | | | The meta-oe bbappend only increments PRINC, if we bump INC_PR here we can remove that. (From OE-Core rev: 976a06f41558d2246173414658d9f7b8eee193d6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility: added list of modules to be compiledFelipe F. Tonello2013-04-031-2/+4
| | | | | | | | | | | This is useful for users that want to .bbappend this recipe to select specific modules to be compiled. (From OE-Core rev: 2ddb7afd15e53ef75b5084d691115e0f58ff24ab) Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility: Add pulseaudio dependency if DISTRO_FEATURES has pulseaudioFelipe F. Tonello2013-03-181-1/+1
| | | | | | | | (From OE-Core rev: 12fc36be5796142b55edde67f1220531bb95cb29) Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt-mobility: Add bluez dependency if DISTRO_FEATURES has bluetoothFelipe F. Tonello2013-03-181-2/+5
| | | | | | | | | | | Some modules doesn't requires bluez4 to compile. So it's unnecessary to have it as dependency. (From OE-Core rev: ccc76f42590430b2c5d286c72e6a01a21b29a9a3) Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: package keyboard driversAndreas Oberritter2013-03-051-0/+1
| | | | | | | | | | | | | | | | | * 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. (From OE-Core rev: f477717a6e9b5820b6e6e505d64adb5d3a64abc7) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-embedded: Enable Linux Input supportOtavio Salvador2013-02-281-1/+1
| | | | | | | | | | | This allow use of Linux Input directly so being able to use 'evdev' driver for keyboard use. (From OE-Core rev: 095a64abaf3b47d7621b2ada7221763c49b8f1ca) 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>
* meta-toolchain-qt.inc: Use CXX when linkingOtavio Salvador2013-02-191-1/+1
| | | | | | | | | | | | 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. (From OE-Core rev: 4ade9c60acea0ac92d0a08f3078361b6f54c85e2) 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>
* qt4: use system SQLitePaul Eggleton2013-02-111-1/+1
| | | | | | | | | | | | | | 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]. (From OE-Core rev: 33e0afd2fffdef4dccfce6383bc646f975972b1e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix CVE-2013-0254Eric Bénard2013-02-064-2/+150
| | | | | | | | | | | | fix "POSIX shared memory segments created world-writeable" more details : http://lists.qt-project.org/pipermail/announce/2013-February/000023.html (From OE-Core rev: e7d8746c32d1ef08327ca4774812af9a8e75a0c4) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qmmp: update to 0.6.6 and fixPaul Eggleton2013-02-063-8/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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]. (From OE-Core rev: 12484dca3bf09dd9a03442a223885deb7472a6cd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nativesdk-qt4-tools: fix DEPENDS, as nativesdk is now prefixedDenys Dmytriyenko2013-02-061-2/+2
| | | | | | | (From OE-Core rev: 871549996cfcaf860083d867eb6a9522f4407cd4) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Add space for _appendsSaul Wold2013-02-012-2/+2
| | | | | | | | | With out the space we get -x11-no-neon concatanted incorrectly (From OE-Core rev: 82602d2c55f5d233bd8351e95a84a65b792786e5) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* QT4: use '-no-neon' if cpu does not support neonRoy.Li2013-02-012-4/+4
| | | | | | | | | | Some armv7a cpu does not support neon, like SPEAr1310, so we should check against "neon" in TUNE_FEATURES. (From OE-Core rev: 173d430ab2a06fb86f1c5bb0ca60376dd2fdbdfb) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* add meta-toolchain-qtEric Bénard2013-01-169-64/+94
| | | | | | | | | | | | | | | | - 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 (From OE-Core rev: cc803b06841e75aa6591abaeda0a788e888e208b) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: blacklist untrusted SSL certificatesEric Bénard2013-01-075-2/+153
| | | | | | | | | | | | - 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 (From OE-Core rev: aafcf34aa8be3525ada517b770e43ad05de5a4b6) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nativesdk-qt4-tools: fix do_configure to be reentrantMartin Jansa2012-12-111-2/+2
| | | | | | | | | | * without = it can add g++ prefix multiple time when you reexecute do_configure (e.g. after failure) (From OE-Core rev: 4f891901bcf7be95cebca1a7296e7ea656adee74) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: upgrade to 4.8.4Martin Jansa2012-12-1133-120/+133
| | | | | | | | | | * changes in licenses are only s/Nokia/Digia/ (From OE-Core rev: 5d898695ab3ce368a1d1f2066bb980ee829ae077) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-native & ghostscript: update upstream status for their patchesChen Qi2012-12-061-1/+2
| | | | | | | | | | Update the upstream status for patches of long building path. (From OE-Core rev: 58b83f7dad8f0d252f8028349d734987081b7507) 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>
* quicky: tidy up inheritPaul Eggleton2012-12-061-4/+2
| | | | | | | | | | | | * 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 (From OE-Core rev: 62db8745c1b907ebec222751cd9cb174dd5f2f96) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qmmp: remove qmake2 from inheritPaul Eggleton2012-12-051-3/+2
| | | | | | | | | qt4x11 already inherits qmake2 so it doesn't need to be inherited again. (From OE-Core rev: ed96c0a6a5a394842777a1413b89d3ea3aabb532) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fotowall: tidy upPaul Eggleton2012-12-051-5/+5
| | | | | | | | | | | | * 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 (From OE-Core rev: e5e6a02923ca28dd6863dcf96c1d0619f049c64a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-native: make qt4-native work with long building pathChen Qi2012-12-032-1/+84
| | | | | | | | | | | | | | | | | 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] (From OE-Core rev: a635553cf46a7e43e81eab1a1baeae98312881d2) 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>
* meta-toolchain-qte: add --sysroot option to OE_QMAKE_(CC|CXX|LD)Laurentiu Palcu2012-11-241-5/+5
| | | | | | | | | | | | | | | 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] (From OE-Core rev: 758f56523daa7d8c8b459757c70b50421d28b8dd) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: remove 4.8.1Ross Burton2012-11-2030-1392/+0
| | | | | | | (From OE-Core rev: 5f6d7d61d79215ffe38aa6b122ae5ac0af7e859a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: remove negative preference on 4.8.3Ross Burton2012-11-203-6/+0
| | | | | | | (From OE-Core rev: 36e42fa771ddd11e169d92dd31d213ba84538012) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.confMartin Jansa2012-11-125-5/+5
| | | | | | | | | | | | | | | | | | | | 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 (From OE-Core rev: 181874ba8033535bb4ce2b36725ae0a71c27b3bd) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* PACKAGES_DYNAMIC: use += instead of = in most casesMartin Jansa2012-10-192-2/+2
| | | | | | | | | | * to keep ${PN}-locale from bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*" (From OE-Core rev: 73252b16b501c0986b0ca0895e4534895a9ba3db) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* PACKAGES_DYNAMIC: use regexp not globMartin Jansa2012-10-193-3/+3
| | | | | | | | | | | * 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) (From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: use extra variable for more QT_CONFIG_FLAGS fragmentsMartin Jansa2012-10-182-4/+12
| | | | | | | | | | | * 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 (From OE-Core rev: 0479242a18661cb7fc3d76d208c82fe6ae4378ce) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.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>