Commit Graph

214 Commits

Author SHA1 Message Date
Khem Raj 01416520c3 qt4: Fix kmap2qmap build with clang
Adapted and backported https://codereview.qt-project.org/#/c/107464/

Fixes errors like
../../include/QtCore/../../src/corelib/tools/qalgorithms.h:161:20:
error: call to function 'operator<' that is neither visible in the
template definition nor found by argument-dependent lookup
        return (t1 < t2);

(From OE-Core rev: db87b70b6422cea860b5ad688015e4b668ff605d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-23 09:53:00 +01:00
Paul Eggleton 5ff7e8deb6 qt4: remove already merged patch
This patch was merged into the 4.8.7 release. This was missed on
upgrade, and we didn't notice because our quilt-based patch handling
code ignores already-applied patches.

(From OE-Core rev: 598c9660f26018a748a4749377389ced7eab2229)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-23 09:52:58 +01:00
Pascal Bach 7c71bc8a99 nativesdk-qt4-tools: depend on nativesdk-qt4-tools only if DISTRO_FEATURES includes x11
Currently nativesdk-qt4-tools can't be built if the DISTRO_FEATURES doesn't contain x11.
To make it build we add a dependency to x11 only if the feature is activated.

(From OE-Core rev: 7216116c9552e812d8c75c0687223f9a84204a28)

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-27 23:29:15 +01:00
Robert Yang de2d643640 qt4: fixes for sed command
* There is no $$QT_BUILD_TREE/bin/lrelease in any .pro file, so remove
  the sed command.
* Only translations/translations.pro has "qtPrepareTool(LRELEASE", so
  use the file name directly rather than find all the .pro files.
* The SEDME in linux.conf had been gone in 2010, and no
  '-Wl,-rpath-link' in linux.conf either, so remove the sed commands.

(From OE-Core rev: e519ce3675a90ce6583ced9ddb84260ff08bc74b)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-12 22:55:45 +01:00
Richard Purdie 86d30d756a meta: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False)
since at some point in the future, having the default of expansion would
be nice. This is the first step towards that.

This patch was mostly made using the command:

sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *`

(From OE-Core rev: ab7c1d239b122c8e549e8112c88fd46c9e2b061b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-23 11:57:25 +01:00
Kai Kang 3739d36068 qt4-4.8.7: restore arm64 patches which are dropped by mistake
During upgrade qt4 from 4.8.6 to 4.8.7, four arm64 patches are removed.
But three of them are dropped by mistake that they are not merged by
upstream and still needed.

Restore them.

(From OE-Core rev: 9d6f8fc0524d4f9968acc11058aa620764e092a4)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-23 11:46:58 +01:00
Kai Kang ba93bdd38d qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7.

* remove arm64 related patches which are merged
* remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch
  which is backported.
* update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
  and 0013-configure-add-crossarch-option.patch for new version
* remove useless variable INC_PR

(From OE-Core rev: 4d033fdc5e754e22edb2e9074e30e58847c4b791)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-08 17:34:02 +01:00
Alexander Kanavin 5cc614ed68 qt4: unconditionally disable gstreamer 0.10 support in qt webkit
Previously it was auto-detected in a broken way, which was causing build errors
for qt-mobility. Qt4 build will fail if some gstreamer 0.10 packages are
available at build time, but not all. It will not fail if none of
the packages are available or if all of them are available. We can't guarantee either,
hence this patch.

(From OE-Core rev: 968973d55d4b33e1a929ed4cdf9387fcaba2d93f)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-30 22:26:14 +01:00
Alexander Kanavin 4c67abd709 qt4: disable Phonon framework
This allows removal of gstreamer 0.10 dependency from Qt4 recipe

https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294
(From OE-Core rev: 096b71a5c24378a449bc38063316555f02af8e18)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-20 21:41:08 +01:00
Alexander Kanavin b2365c4e18 qt4: remove Qt Mobility
Qt Mobility is an obsolete and unmaintained framework that is also
dependent on gstreamer 0.10

https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294

(From OE-Core rev: bbad6c226f1ff2657c6095141bbf3ec936a42feb)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-20 21:41:08 +01:00
Dmitry Eremin-Solenikov 9f8391602b qt4-x11-free: make virtual/libgl dependency conditional
Make qt4-x11-free depend on virtual/libgl only if the DISTRO_FEATURES
contains opengl. Otherwise there will be no package to fullfil this
dependency.

(From OE-Core rev: aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8)

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-14 11:43:57 +01:00
Krishnanjanappa, Jagadeesh 5bed033beb qt4-embedded: add checking for AArch64 ilp32
1. Cross-compiling qt4-embedded and qt4-x11-free applications for AArch64 ilp32
   (both big and little endian) fails with below error,

(snip)
In file included from ../3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h:31:0,
                 from ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.h:32,
                 from ../3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h:26,
                 from ../3rdparty/javascriptcore/JavaScriptCore/runtime/ClassInfo.h:26,
                 from ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.h:27,
                 from ../3rdparty/javascriptcore/JavaScriptCore/API/JSCallbackConstructor.h:30,
                 from ../3rdparty/javascriptcore/JavaScriptCore/API/JSCallbackConstructor.cpp:27:
../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h: In instantiation of 'TO QTWTF::bitwise_cast(FROM) [with TO = int; FROM = double]':
../3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h:52:49: required from here
../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h:63:1: error: size of array is negative
../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h: In instantiation of 'TO QTWTF::bitwise_cast(FROM) [with TO = double; FROM = int]':
../3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h:57:47: required from here
../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h:63:1: error: size of array is negative
make[1]: *** [obj/release/JSCallbackConstructor.o] Error 1
-- CUT --

    the error is because of JSVALUE64 is being defined while compiling
    programs for AArch64 ilp32. This makes equal condition checking of
    intptr_t and double datatypes as false, and results in -1 (negative)
    as array size in bitwise_cast function.
    The patch defines JSVALUE64, if the programs are being compiled for
    AArch64 64bit NOT for ilp32.

2. qt4_arch.inc is modified to set system architecture as aarch64 if the
   TARGET_ARCH is other than aarch64. Without this modification, for
   TARGET_ARCH equal to aarch64_32, aarch64be, aarch64be_32; the system
   architecture is set as 'generic' and results in below error.

configure log:
(snip)
64-bit AMD 80x86 (x86_64)
'-opensource' is unsupported, using 'generic'
'x86_64' is supported
System architecture: 'generic'
Host architecture: 'x86_64'
-- CUT --

build error:
(snip)
In file included from ../../include/QtCore/qatomic_generic.h:1:0,
                 from ../../include/QtCore/../../src/corelib/arch/qatomic_arch.h:64,
                 from ../../include/QtCore/qatomic_arch.h:1,
                 from ../../include/QtCore/../../src/corelib/thread/qbasicatomic.h:227,
                 from ../../include/QtCore/qbasicatomic.h:1,
                 from ../../include/QtCore/../../src/corelib/thread/qatomic.h:46,
                 from ../../include/QtCore/qatomic.h:1,
                 from ../../include/QtCore/../../src/corelib/tools/qbytearray.h:45,
                 from ../../include/QtCore/qbytearray.h:1,
                 from ../../include/QtCore/../../src/corelib/tools/qstring.h:46,
                 from ../../include/QtCore/qstring.h:1,
                 from ../../include/QtCore/../../src/corelib/kernel/qobject.h:48,
                 from ../../include/QtCore/qobject.h:1,
                 from ../../include/QtCore/../../src/corelib/kernel/qcoreapplication.h:45,
                 from ../../include/QtCore/qcoreapplication.h:1,
                 from qdbusintegrator.cpp:42:
../../include/QtCore/../../src/corelib/arch/qatomic_generic.h: In instantiation of 'bool QBasicAtomicPointer<T>::testAndSetOrdered(T*, T*) [with T = const QString]':
qdbusintegrator.cpp:76:1:   required from here
../../include/QtCore/../../src/corelib/arch/qatomic_generic.h:197:88: error: invalid conversion from 'const void*' to 'void*' [-fpermissive]
../../include/QtCore/../../src/corelib/arch/qatomic_generic.h:108:20: error: initializing argument 2 of 'bool QBasicAtomicPointer_testAndSetOrdered(void* volatile*, void*, void*)' [-fpermissive]
../../include/QtCore/../../src/corelib/arch/qatomic_generic.h:197:88: error: invalid conversion from 'const void*' to 'void*' [-fpermissive]
../../include/QtCore/../../src/corelib/arch/qatomic_generic.h:108:20: error: initializing argument 3 of 'bool QBasicAtomicPointer_testAndSetOrdered(void* volatile*, void*, void*)' [-fpermissive]
make[1]: *** [.obj/release-shared-emb-auto/qdbusintegrator.o] Error 1
make[1]: *** Waiting for unfinished jobs....
-- CUT --

   So, select system architecture (via QT_ARCH) as aarch64 for
   AArch64 and its other variants

(From OE-Core rev: 5f191d86b8d60624d729b3b147c1dff818326dbd)

Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-03 11:43:49 +01:00
Jonathan Liu 21e2c03a00 qt4: add patch for BMP denial-of-service vulnerability
For further details, see:
https://bugreports.qt.io/browse/QTBUG-44547

(From OE-Core rev: 840fccf8ec7691f03deeb167487cde941ebea8bf)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-09 15:58:00 +00:00
Richard Purdie c4cc479beb qt-mobility: Add patch to fix disabling bluez compile issues
If you disable bluez but have dbus enabled, the build would fail. This patch
fixes the issue so that bluez5 based builds work.

(From OE-Core rev: 1324839b2be97c19e0a1fbd6ec8d3357731e5973)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-19 07:51:38 +00:00
Peter A. Bigot 3f8c532e6d qt-mobility: select distro preference for bluez provider
(From OE-Core rev: 47d31abef49494b408f6ba004638bac007782947)

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-17 13:43:40 +00:00
Mark Hatle 3bf5b6de3e arch-mips.inc: Change definition of TRANSLATED_TARGET_ARCH
[YOCTO #7230]

In certain system configurations TRANSLATED_TARGET_ARCH will not
expand in the right order for gcc-cross-candian-mips64n32 to be
generated properly.

This will cause SDKs to fail to generate properly.

Changing the global definition of TRANSLATED_TARGET_ARCH always
expands the ABIEXTENSION, which causes the OVERRIDES to pick it up
as well.  This effectively defines a new class of overrides for the 'n32'.

The side effect is that we need to duplicate some mips64 overrides, and
redefine others that were previously 'n32' or 'mips64' exclusive to have
the correct semantics.

(From OE-Core rev: 4b3a2b703b20583bd107f00a297d972e9bfb514a)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-29 15:36:49 +00:00
Hongxu Jia 5b7371b832 qt4-embedded: support c++0x stand for directfb
While directfd upgrade to 1.7.6, it always includes directfb++ utils
when C++ is used and set c++0x as c++ standard.
(In git://git.directfb.org/git/directfb/core/DirectFB.git
commit b444bcae3197be9faf883460dcc239ef757d5922, and commit
522beeb76f2a8d2dee30d928d2a5955bd06cf25c)

The directfd in qt4-embedded is c++, and there was a build failure:
...
| qdirectfbwindowsurface.cpp:336:69: error: in C++98 'rect' must be
initialized by constructor, not by '{...}'
|      const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
...

The g++ used c++98 as default c++ standard, we should
explicitly set c++0x for directfd in qt4-embedded.

(From OE-Core rev: 833cb0e47f7542a67bdf943cede1754b7a20c1d9)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-16 23:08:20 +00:00
Mike Looijmans d1b523e7dd qt4: Fix QT4 applications spamming "QWSLock::down(): Invalid argument"
If you run a QT server application, and a client in a separate process, it will
spam the log with "QWSLock::down(): Invalid argument" messages because of an old
bug in the locking code. There's a patch on the net that fixes it, which I manually
adapted by removing the commented-out debug statements.

We have been using this patch for about half a year without problems, and the QT people
apparently don't care about the bug, for which this solution has been posted in 2012.
Including this into OE core will at least save other people the trouble of having to find
and apply it for themselves.

(From OE-Core rev: 7b6546e0ee5561ece1c7972bb8dde7383b530eb7)

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-07 23:35:07 +00:00
Kai Kang fbfabde9d5 qt4: add aarch64 support
Add aarch64 support for qt4 packages.

Most of the patches are derived from debian:
http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/tree/debian/patches

Add arch check to set right QT_ARCH.

Disable webkit temporarily for qt4 and qt4-embedded that they fail to build:

| runtime/JSValueInlineMethods.h: In constructor
'JSC::JSValue::JSValue(const JSC::JSCell*)':
| runtime/JSValueInlineMethods.h:242:78: error: cast from 'JSC::JSCell*'
to 'int32_t {aka int}' loses precision [-fpermissive]

It has been fix by Qt5, but didn't backport to Qt4. There is an still open
defect for it:
https://bugreports.qt-project.org/browse/QTBUG-35442

(From OE-Core rev: 886e0d43f2a543a13ac8e3f1cb570ecae90339e0)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-23 10:18:18 +00:00
Jackie Huang 07f7764e95 qt4: disable webkit for mips64 n32 temporarily
Disable webkit for mips64 n32 temporarily that fails to compile.

The webkit package also disable the build for n32:
f5c4d18 webkit/midori: block to build webkit on mips64 with libn32 ABI

The opened defect in qt upstream is:
https://bugreports.qt-project.org/browse/QTBUG-39224

(From OE-Core rev: 68d274be3e07689e749d832fbb01712e00fb4545)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-05 18:01:05 +00:00
Jonathan Liu ea8945bad8 qt4: fix bug tracker URLs for patches
(From OE-Core rev: 6523113a547042fc34110835fb658ee064d84a5f)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-09-29 12:12:45 +01:00
Jonathan Liu d7d028e90b qt-mobility: fix source URL
The source is no longer available from the original URL.

(From OE-Core rev: 502b0d1f68ad7668df153d3cfb8ca35f02313c1e)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-09-29 12:12:45 +01:00
Khem Raj 09e3e78999 recipes: Remove references to eglibc
change use of eglibc related variabled to glibc equivalents

(From OE-Core rev: fd15d6e0c8da75951a91d4467eda23c229b1026d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-09-01 18:03:05 +01:00
Marek Vasut f62150b09e qt4: Avoid duplicate flags in the g++-unix.conf
The removed flags from this g++.conf file, which is installed to the
target as g++-unix.conf are added by gcc-base.conf . Do not add those
flags twice.

(From OE-Core rev: 3c49c575632cdac7bf950439b33773f09ae63354)

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-11 12:12:34 +01:00
Paul Eggleton 1380d51659 qt4: add patch for GIF denial-of-service vulnerability
For further details, see:
https://bugreports.qt-project.org/browse/QTBUG-38367

(From OE-Core rev: c322f67808bb36c5fea3fbabd30aa242e408fc50)

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>
2014-06-03 16:49:19 +01:00
Paul Eggleton 5bd29501ad qt4: upgrade to version 4.8.6
* Remove patches merged upstream
* Add a qtscript translation package for an additional .qm file added in
  this release

(From OE-Core rev: 32a9c7101c7212c69d40893ee597eaf34955b641)

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>
2014-06-03 16:49:19 +01:00
Martin Jansa 8de1de8227 qt4: Explicitly disable sqlite2
* notice that this disables only sqlite2 (sqlite dependency),
  sqlite (sqlite3 dependency) stays enabled

* fixes these errors detected by test-dependencies.sh:
  qt4-embedded/qt4-embedded-plugin-sqldriver-sqlite2/latest doesn't exist
  qt4-embedded/qt4-embedded-plugin-sqldriver-sqlite2-dbg/latest doesn't exist
  qt4-x11-free/qt4-plugin-sqldriver-sqlite2/latest doesn't exist
  qt4-x11-free/qt4-plugin-sqldriver-sqlite2-dbg/latest doesn't exist

(From OE-Core rev: 279c221d9dfce43254ed1f03cf84ea454cc7b485)

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>
2014-05-06 17:59:17 +01:00
Otavio Salvador 4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.

(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:19 +01:00
Martin Jansa 84aeaa4d56 Revert "qt-mobility: remove /usr/lib from ld rpath-link option"
* Basically part of the headers/libs are installed in
  ${D}(${libdir}/${includedir}) instead of
  ${D}(${libdir}/${includedir})/qt4

* http://lists.openembedded.org/pipermail/openembedded-core/2013-October/085815.html
  is related, but doesn't fix the issue completely, so better
  revert the commit which introduced this issue

[YOCTO #5414]

This reverts commit f7409a9fe83ba2535a43f39ed57cd78242a88557.

(From OE-Core rev: 2b6a1cf9c7e05d204df82aa962d3ae09744dd86a)

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>
2014-04-04 11:53:51 +01:00
Hongxu Jia ae59f6ff20 qt-mobility: fix metaobjectbuilder build errors
Backport upstream patches to fix the build errors:

ipc/qmetaobjectbuilder.cpp:803:65: error: invalid conversion from \
'QMetaObjectExtraData::StaticMetacallFunction {aka void (*)(QObject*, \
QMetaObject::Call, int, void**)}' to 'QtMobility::QMetaObjectBuilder:: \
StaticMetacallFunction {aka int (*)(QMetaObject::Call, int, void**)} \

Upstream-commit:
f102053b28

Task-number: QTMOBILITY-1990

[YOCTO #4575]

(From OE-Core rev: a4b9e424a7186bc3ba49c2566237600ed1682d7f)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28 14:01:13 +00:00
Paul Eggleton a011d8af63 qt4: set SUMMARY and tweak DESCRIPTION
(From OE-Core rev: da0a84295583aaf9f943f7e3a64373079a70024d)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:22 +00:00
Paul Eggleton cec8b230cf Replace one-line DESCRIPTION with SUMMARY
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.

(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Enrico Scholz c3c2cc4180 qt4: fixed dependency on icu
Commit 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62 added 'icu' to DEPENDS
in qt4-x11 only, but enabled icu globally in qt4.inc.

This breaks build of qt4-embedded because this recipe does not have
such a DEPENDS but uses qt4.inc:

| icu.cpp:42:28: fatal error: unicode/utypes.h: No such file or directory
|  #include <unicode/utypes.h>
|                             ^
| compilation terminated.
| make: *** [icu.o] Error 1

Patch moves the 'icu' dependency into qt4.inc.

(From OE-Core rev: adb6e64d69fc947f2c8fa708dcbe854fd2b574f8)

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Cc: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-05 14:24:42 +00:00
Ross Burton ea03ed0e8d qt4-x11-free: depend on ICU
ICU presence is auto-detected at configure time and until recently (e68850 and
d61230) was pulled into most builds through harfbuzz and beecrypt.  Now it's
floating and this leads to build failures.

As in all likelihood the majority of people were building this with ICU enabled,
add an explicit dependency.

(From OE-Core rev: 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-30 22:26:29 +00:00
Hongxu Jia 3cc043d404 lib32-qt4-examples: fix QA warnings and INSANE_SKIP not work
Fix the following warnings:
...
lib32-qt4-examples: found library in wrong location: /usr/bin/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
lib32-qt4-examples: found library in wrong location: /usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
...

In oe-core f119566477243ce43b727492dc78b9cb3dd76de4, it added INSANE_SKIP
libdir for examples packages as it includes plugin shared libraries outside
of libdir.

But it hardcoded ${QT_BASE_NAME} as INSANE_SKIP's package name
and it didn't work while multilib enabled.

Add ${MLPREFIX} as package name's prefix in INSANE_SKIP

[YOCTO #5516]

(From OE-Core rev: d63588ddd5a1f08fff90f5bb3f7278490e359720)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-20 14:03:25 +00:00
Jonathan Liu f8a96534ff qt4: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patch
(From OE-Core rev: 3af8f2e0697a9523d3b505ba4c48eca35f6de3a9)

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-10-30 13:39:09 +00:00
Laurentiu Palcu 60e271a3cd nativesdk-qt4-tools: create qt.conf file
When installing the SDK to another location than the default one, qmake
will look for libraries, headers, etc. in the default location. That's
because the paths are hard-coded in the binary itself. Luckily, QT
allows to override this using a qt.conf file installed in the same
directory with the application executable. However, we already have a
patch that allows for the installation of qt.conf in another place and
read the location from QT_CONF_PATH environment variable.

Hence, install qt.conf in ${sysconfdir}. This will allow other apps, that
use QLibraryInfo class, to find it.

[YOCTO #5339]

(From OE-Core rev: 23f88695683a8e428375a8ccb6be935347a8768c)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-29 10:41:37 +00:00
Jonathan Liu 7266015ef2 qt4: add upstream QTBUG-31579 patch for QPainter regression
(From OE-Core rev: a5afc67cbfc32beb3be10392bf9788cfc3610ab1)

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-10-14 16:55:26 +01:00
Paul Eggleton 68ec3d4925 qt4-x11-free: disable QGtkStyle
This currently leads to a floating dependency on GTK+. Since most users
in an embedded context won't need this, just disable it by default.

Fixes [YOCTO #5116].

(From OE-Core rev: 6bef1e02dff6c6482791ab424d7e5dedeb840cf6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-26 16:37:57 +01:00
Eric Bénard cb2496c607 qt-mobility: fix build without X11
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

(From OE-Core rev: 21857f0842501b0c72c77e5fb290aec85b1c28ff)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-22 12:19:33 +01:00
Jonathan Liu 10197429eb qt4: add upstream QTBUG-32534 patch for QHttpMultiPart upload corruption
(From OE-Core rev: 59c02272fe77589e265da6fc3fa3db0c76bcdf52)

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-08-06 12:39:58 +01:00
Paul Eggleton 1820d33ac3 qt-mobility: tighten up config generation and use PACKAGECONFIG
* 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.

(From OE-Core rev: 9d64f117cccf69916ce5b08039edcb3a19dc2b58)

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>
2013-07-18 21:23:41 +01:00
Andreas Oberritter 02d5ea60b9 qt4-x11-free: fix post-processing of QtWebKit.pc
Previously it worked for qt4-embedded only. qt4-x11-free has X11
libs between -lwebcore and -ljscore.

(From OE-Core rev: 5110f3894902db6e9a35cce40b91943b3b2ee237)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:36 +01:00
Jonathan Liu 10cdbf1fd2 qt4: add upstream QTBUG-31579 patch to fix polyline drawing regression
(From OE-Core rev: 9cec5833bd1a19794a0d7d77c2412d451dc30dc8)

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-07-10 09:42:02 +01:00
Richard Purdie 1defbaf8b7 qt4: Take PV increase opportunity to drop PR
(From OE-Core rev: b97570c66737a6c404b49459cd95184abb855399)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-05 15:50:10 +01:00
Jonathan Liu 0463e5c173 qt4: upgrade to 4.8.5
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin
shared libraries outside of libdir.

(From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4)

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-07-05 15:44:13 +01:00
Paul Eggleton 470fe27679 qt4: disable qmeegographicssystemhelper
We don't want this enabled just because we have EGL and OpenGL ES 2.0
enabled.

(From OE-Core rev: 85aa73d397cb42a2fc8d6f901f8db1d601972741)

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>
2013-07-05 15:34:26 +01:00
Hongxu Jia 4770cff7b9 qt-mobility: fix build in the absence of xvideo
QMake pro files don't explicitly define QT_NO_XVIDEO if the
configuration lacks xvideo, but plugins code relies on this define.

[YOCTO #4775]

(From OE-Core rev: 0d7b208d09e6511dbedfde60abd4bef9a0c596ee)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-05 15:34:25 +01:00
Roy.Li f8c32f7402 qt-mobility: remove /usr/lib from ld rpath-link option
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>
2013-06-25 17:44:57 +01:00
Jonathan Liu ed4a919cae qt4: add eglibc-gconv-utf-16 to QtCore RRECOMMENDS when using glibc
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>
2013-06-21 09:19:27 +01:00