aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
AgeCommit message (Collapse)Author
2013-09-20qt-mobility: fix build without X11Eric Bénard
else we get : arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon .../... ibQtSystemInfoE.so.1 -o libQtSystemInfoE.so.1.2.0 .../... -lblkid -ludev -lX11 -lXrandr -lQtDBusE -lQtXmlE -lQtGuiE -lEGL -lQtNetworkE -lQtCoreE -lpthread .../build/tmp-defaultsetup-eglibc-eglibc/sysroots/x86_64-linux/usr/libexec/armv7a-vfp-neon-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.8.1/ld: cannot find -lXrandr make[2]: *** [../../lib/libQtSystemInfoE.so.1.2.0] Error 1 Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-05qt4: add upstream QTBUG-32534 patch for QHttpMultiPart upload corruptionJonathan Liu
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-18qt-mobility: tighten up config generation and use PACKAGECONFIGPaul Eggleton
* Add DEPENDS on util-linux (for libblkid) and gstreamer (was likely always being auto-detected since it is currently an unconditional dependency of Qt itself in our Qt recipes) * Use PACKAGECONFIG to allow individual configuration of pulseaudio and bluetooth features rather than additional variables * Generate a static platform configuration and tell the configure script to use that instead of running compile tests during do_configure. This should avoid the issue of camerabin sometimes being built and failing as seen on the Yocto Project autobuilder. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-12qt4-x11-free: fix post-processing of QtWebKit.pcAndreas Oberritter
Previously it worked for qt4-embedded only. qt4-x11-free has X11 libs between -lwebcore and -ljscore. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-09qt4: add upstream QTBUG-31579 patch to fix polyline drawing regressionJonathan Liu
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-05qt4: Take PV increase opportunity to drop PRRichard Purdie
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-05qt4: upgrade to 4.8.5Jonathan Liu
Removed patches integrated upstream. Added INSANE_SKIP libdir for examples packages as it includes plugin shared libraries outside of libdir. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-05qt4: disable qmeegographicssystemhelperPaul Eggleton
We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-05qt-mobility: fix build in the absence of xvideoHongxu Jia
QMake pro files don't explicitly define QT_NO_XVIDEO if the configuration lacks xvideo, but plugins code relies on this define. [YOCTO #4775] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-25qt-mobility: remove /usr/lib from ld rpath-link optionRoy.Li
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 Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-20qt4: add eglibc-gconv-utf-16 to QtCore RRECOMMENDS when using glibcJonathan Liu
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] Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-14qt4: set QMAKE_COMPILER to gcc in mkspecJonathan Liu
This avoids the following warning when running qmake: Project WARNING: qmake spec does not announce the compiler family. Guessed gcc. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-14qt4: disable gdb_dwarf_indexJonathan Liu
* 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 Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-10qt4: fix QMAKE_QT_CONFIG being overwritten with empty valueJonathan Liu
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 Liu
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 Liu
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 Liu
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10qt4-native: update HOMEPAGEJonathan Liu
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10qt4-embedded: update HOMEPAGEJonathan Liu
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-10qt-mobility: update HOMEPAGEJonathan Liu
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 Liu
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 Liu
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üller
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 Barker
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 Blundell
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 Eggleton
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-16qt4-x11-free: bump PR to allow removal of meta-oe bbappendPaul Eggleton
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. Tonello
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. Tonello
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. Tonello
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 Oberritter
* 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 Salvador
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-11qt4: use system SQLitePaul Eggleton
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énard
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-06nativesdk-qt4-tools: fix DEPENDS, as nativesdk is now prefixedDenys Dmytriyenko
Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-01qt4: Add space for _appendsSaul Wold
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.Li
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-07qt4: blacklist untrusted SSL certificatesEric Bénard
- 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 Jansa
* 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 Jansa
* 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 Qi
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-03qt4-native: make qt4-native work with long building pathChen Qi
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-19qt4: remove 4.8.1Ross Burton
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 Burton
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 Jansa
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 Jansa
* 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 Jansa
* 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 Jansa
* 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 Purdie
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 Jansa
* 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>