review.tizen.org Git - scm/bb/tizen-distro.git/log

qmake5_base.bbclass: Fix mkspec path when building nativesdk binaries

When building nativesdk binaries we ought to rely in the native
mkspecs.

(From meta-qt5 rev: 578657f7b6468af31ba399b02a4dac3c353db71b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

nativesdk-qtbase.inc: Fix build failure removal of include and mkspecs

The 7d8f8d6 change (nativesdk-qtbase.inc: Remove unused contents)
introduced a build failure that was not catch in my test. This patch
fixes it avoiding removing the headers and mkspecs files which are
need for the nativesdk-qttools recipe.

(From meta-qt5 rev: 8da5017712a7ddcb8488e095b9aa03b0273f23e9)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

nativesdk-qtbase.inc: Remove unused contents

Fixes:

ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
  ...

(From meta-qt5 rev: 7d8f8d6b5a00af7a212cce41350f4e1c5989aabd)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

nativesdk-qtbase: Fix install error in case install task is rerun

In case changes are done in do_install and the sstate checksums
change, the task would fail as the qmake binary has already been
replaced. Avoid this error checking for the original filename.

(From meta-qt5 rev: 7c5306107c60b1a1e0bb8c4c3b8b80afa59a426a)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

meta-toolchain-qt5: add Qt5 SDK standalone meta recipe

(From meta-qt5 rev: db9d6b401c101685dfb89557e06e451dcc0af1f0)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

populate_sdk_qt5.bbclass: Allow generation of toolchain

This allow the toolchain generation using '-c populate_sdk' as it
includes the need host libraries into the SDK.

(From meta-qt5 rev: f803570841608ec5e81675e4b85613fbf0062839)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

packagegroup-qt5-toolchain-target: Add packagegroup

Allow easy inclusion of target packages for the Qt5 SDK or external
toolchain.

The list of the target package is based on the Arago Project, which
has been contribute by Denys Dmytriyenko <denys@ti.com>.

(From meta-qt5 rev: 3cc5613d226d95f5f4e802856f507efaf44cb968)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

nativesdk-packagegroup-qt5-toolchain-host: Add packagegroup

Allow easy inclusion of host packages for the Qt5 standalone SDK or
external toolchain.

(From meta-qt5 rev: d768d975282b8a230314880ab6acd334440a6214)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

README: Reword the section about github forking

This splits the lines in 80 cols and rework the text a little bit to
easy reading.

(From meta-qt5 rev: 91ac66d5e4867d7e400bbffe5b31caa8ed660fbb)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit: drop obsolete patch 0001-jsc-Add-licuuc-licui18n-LIBS.patch

This patch caused a linker error:

| linking ../../bin/jsc
| [...]ld: cannot find -licuuc -licui18n

The linker command-line contains:

| [...] -licuuc\ -licui18n [...] -licui18n -licuuc -licudata [...]

So the problem gets caused by the backslash, making the actual library
name "libicuuc -licui18n.so". This may have been caused be the double
quotes used in the patch. However, since both libs are already part
of the command-line, the patch can just get dropped. The patch indicates,
that it was created for a beta version, so I assume that this was
fixed before the 5.2 release.

(From meta-qt5 rev: a317282d25c1355e085de80b71a0b199c773bb8b)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtmultimedia.inc: Fix duplicating '{'

(From meta-qt5 rev: 7cca3003fa653447d814ead3fd805bd87c5872fd)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

cmake-native: disable test for Qt5Core

Fixes the same build error as 671313d, but for the -native recipe.

(From meta-qt5 rev: 0b8e8124ed8e6573516efa244b67b70a39874de8)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtmultimedia: Use PACKAGECONFIG for gstremer-0.10 and change it to disabled by default

* it doesn't support gst-1.x like qtwebkit yet, disable it by default to
build images without gst-0.10 where possible.

(From meta-qt5 rev: faad8d1df1aee67f9d1a7e9ea3c13f92d04baf8e)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qttools: add target build

this does not build much yet but I was looking for qdbus

(From meta-qt5 rev: fc289452b6465009a4c7ae6aa70060e55779a81c)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5: Fix cmake config files

* without syncqt cmake config files have empty PRIVATE_INCLUDE_DIRS
remove pregenerated header files and create .git dir to let qmake
call syncqt and generate headers like when building from git recipes

(From meta-qt5 rev: b8a236df79c25802c1f2eb2525e8a534e73e608e)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: remove gstreamer packageconfig

Nothing in qtbase uses gstreamer so the configure option was removed on the way
to 5.2 [1]. Fixes:

| -no-gstreamer: invalid command-line switch

[1] https://qt.gitorious.org/qt/qtbase/commit/e25a4faf4a33a758a51c1b96dfdead2f1675ccd7

(From meta-qt5 rev: 0b4bdeb6c195b3e1abf32e96354e4401d596ec0a)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5: upgrade to 5.2.0

* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
  resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
  resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
  resolved upstream in:
  commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
  Author: Jan Arne Petersen <jan.petersen@kdab.com>
  Date:   Fri Jul 19 14:35:19 2013 +0200
  Fix wayland-scanner to work with CONFIG+=silent

* squash to match more with structure of
  https://github.com/meta-qt5/qtbase/tree/stable

* qtmodules: bump SRCREVs for 5.2.0 tags
  now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
  include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
  fails to build without this
* qtjsbackend: remove for git versions
  Found in [1]:
  Qt Qml is now using its own built-in Javascript engine and does not depend on
  V8 anymore. As such the QtJSBackend shared library has disappeared.
  [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
  qtjsbackend is now completely gone
  it allows to share more .patch files and configuration in .inc again

(From meta-qt5 rev: c908fe4ebd5a04813be0b83c173fae182bb22728)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit: Depend on gstreamer-1.0 instead of 0.10

* since this commit:
  commit e0debe138cb59c140ebbc69755d36028d2b89459
  Author: Allan Sandfeld Jensen <allan.jensen@digia.com>
  Date:   Thu Feb 28 13:42:27 2013 +0100
  Subject: Switch QtWebKit to GStreamer 1.0.

  qtwebkit supports 1.0 and will use that by default when found

(From meta-qt5 rev: 775d77e482f1ea203c78003cccd2547075fd720f)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5.inc: allow to set the package arch globally

If Qt5 (qtbase) is machine specific, then all packages depending
on qtbase will also be machine specific, because the (initial)
qtbase configuration becomes part of Qt5/qmake, thus affecting
builds of packages built against this specific version of qtbase.

Since it is not feasible to add PACKAGE_ARCH=... to each and every
recipe that is built using qmake and depends on Qt5, we introduce
a new variable, QT_PACKAGES_ARCH, that can be set by the machine
configuration as needed.

We have to be careful though to only change the architecture of the
resulting packages if we're not compiling a 'native' package.

(From meta-qt5 rev: 57709a4ee2213a3c352b9cedce1d4b16a1b35042)

Signed-off-by: André Draszik <andre.draszik@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtlocation, qtsystems: Fix QT_MODULE_BRANCH

(From meta-qt5 rev: 72ca958ebfb61640c614ec865196d68fba2576c2)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qttools-native: remove previous license workaround

Previously license files were missing for qttools module, so we used to point
to generic files with same license.

(From meta-qt5 rev: 343101669c91d03d92e714a8cb2ff55a8bb4c924)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

nativesdk-qttools: add nativesdk version of qttools necessary for SDK tools

(From meta-qt5 rev: 512c859380a36b753b5fcca21a31aea4d85a1737)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

nativesdk-qtbase: add nativesdk version of qtbase necessary for SDK tools

(From meta-qt5 rev: 7b898fdc664ca04d50becddb7f57570436bd717e)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

cmake: Rename .bbappend to match new version from oe-core

(From meta-qt5 rev: 662ff3043a4a308e09e7628bf11260aa60341937)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwayland: Fix Project ERROR: Module v8 has no public API

(From meta-qt5 rev: 7327781083aea593b4911b6da7105e4984e28c68)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

maliit-framework-qt5: Add missing dependency on qtdeclarative

* it needs also quick and qml, so qtbase wasn't enough

(From meta-qt5 rev: a6753fa646f714bd0a794d270bd77e951d8204ac)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

maliit-framework-qt5: Add missing dependency on qtbase

(From meta-qt5 rev: d6c3d39a70609c9ce81649af4a923db7185b2b7e)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

cmake: Rename and update .bbappend to match new version from oe-core

(From meta-qt5 rev: faa07fc3a61f16a5de5b548f74c155a81dd86190)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtx11extras: Add recipe

(From meta-qt5 rev: f11778340c574de8cf46b9980a4f8c5b1fa50410)

Signed-off-by: Iktwo Sh <elmaildeliktwo@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit-examples: add missing RDEPENDS for qmlplugins

Some examples require qtwebkit-qmlplugins (flickerview, youtubeview),
and this dependency is not automatically added. Without this patch,
and without manually adding qtwekbit-qmlplugins, we get errors like
this:

qrc:///flickrview.qml:42:1: module "QtWebKit" is not installed

(From meta-qt5 rev: ffe8a0e0ad7e8594ace8c36abb11503bd1668658)

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtconnectivity: Add recipe.

(From meta-qt5 rev: 9f0f1dc647f1097058218cd2e31ed5d054d5164f)

Signed-off-by: Kristofer Hansson Aspman <kristofer.hansson-aspman@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patch

(From meta-qt5 rev: c36be1724a71f2f62cc09c28e34547165a80cce7)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

maliit-framework-qt5: package only ${libdir}/qt5/mkspecs within ${PN}-dev

When we're building maliit with it's input context plugin enable it gets installed into
${libdir}/qt5/plugins/platforminputcontexts which couldn't be added to ${PN} cause it's
already in ${PN}-dev and the only part which should go into ${PN}-dev is
${libdir}/qt5/mksepcs and nothing else from ${libdir}/qt5.

(From meta-qt5 rev: 84cd4be2491895b0c3a0af64e4c83d58910d1f6c)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

maliit-plugins-qt5: add dependency on libqt5svg-plugins

(From meta-qt5 rev: a5de4e3856ad77b0e1ad9a4181ccbd3a91a87f31)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

maliit-framework-qt5: don't replace directory names for maliit-defines.prf

The values from maliit-defines.prf are only used at runtime and not at compilation time so
we don't have to replace them with the proper staging paths.

(From meta-qt5 rev: 3763998ed02ea127c62bba0e7478e817c282d57b)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

maliit-frameworks-qt5: provide ${datadir} also by EXTRA_QMAKEVARS_PRE

(From meta-qt5 rev: 5ecfb7dc5457059bef8a5906f80550c90063ab56)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: Use bundled freetype by default

* system freetype works only together with fontconfig
* building qbasicfontdatabase fails with system freetype and without
  fontconfig or with freetype completely disabled
  | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
    fatal error: freetype/config/ftheader.h: No such file or directory
  |  #include <freetype/config/ftheader.h>
  |                                       ^
  | compilation terminated.
  | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
  | make[2]: *** Waiting for unfinished jobs....

(From meta-qt5 rev: e1d2257f60272df30bf182396d5b1e81b1196581)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: Disable freetype by default

* building qbasicfontdatabase fails without fontconfig enabled
  | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
    fatal error: freetype/config/ftheader.h: No such file or directory
  |  #include <freetype/config/ftheader.h>
  |                                       ^
  | compilation terminated.
  | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
  | make[2]: *** Waiting for unfinished jobs....

(From meta-qt5 rev: 4c177a661fd1ef599835de56776b0ebda6d78e3c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: Disable fontconfig by default

* it was explicitly disabled in
  commit 1b14686657cddcc5bb37a5c7db8a35f1c4903ee3
  Author: Philip Craig <phil@blackmoth.com.au>
  Date:   Wed Jun 26 02:13:02 2013 +0000
  Subject: qtbase: disable fontconfig support by default
* and then accidentaly enabled with PACKAGECONFIG changes
  commit ebdd83f6b7e5c3296e5ebd3b7b0c1e0defe5aba5
  Author: Martin Jansa <Martin.Jansa@gmail.com>
  Date:   Sat Jul 20 00:02:57 2013 +0200
  Subject: qtbase: explicitly enable or disable all deps
* Thanks to Nicolas Dechesne for reporting it

(From meta-qt5 rev: af6014e3bc82b0f9998978819e217b6e020ccdc0)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase_git: restore 0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch in SRC_URI

* commit 105ad2a18e20f2b07d20a1640917e69950c8496b
  Author: Eric B<C3><A9>nard <eric@eukrea.com>
  Date:   Mon Oct 7 22:54:12 2013 +0200
  Subject: qtbase: update to 5.1.1
  removed it from SRC_URI in qtbase.inc, but it's still needed for
  qtbase_git

(From meta-qt5 rev: 3e95350611d0e58e4e773c9b3b004a7a161f94f7)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: add upstream QTBUG-31579 patch for QPainter regression

(From meta-qt5 rev: 096a380851bcd17f0f9a20dc42589d431a47f555)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5.inc: extend FILES_${PN}-examples-*

this fix :
ERROR: QA Issue: non debug package contains .debug directory: qtquick1-examples path
/work/armv7a-vfp-neon-oe-linux-gnueabi/qtquick1/5.1.1-r0/packages-split/qtquick1-examples/
usr/share/qt5/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/.debug/libqmlqtimeexampleplugin.so

(From meta-qt5 rev: ee4ef2a303ffb1f7da8e84f15b27ff72d609df59)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtjsondb: Remove unsupported module

* https://bugreports.qt-project.org/browse/QTBUG-31741

(From meta-qt5 rev: 040dd25bedf46da3399f40c17ea2473a30fa2963)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtgraphicaleffects, qtquickcontrols: Don't use PN in PN-dev RDEPENDS

* fix do_rootfs for images with dev-pkgs in IMAGE_FEATURES
  | Collected errors:
  |  * satisfy_dependencies_for: Cannot satisfy the following dependencies for qtquickcontrols-dev:
  |  *     qtquickcontrols (= 5.1.0-r0) *
  |  * opkg_install_cmd: Cannot install package qtquickcontrols-dev.

(From meta-qt5 rev: 2ecccc2ca2eb017b32db3697f2750b9e7aec78e8)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase.inc: PACKAGECONFIG[linuxfb] shouldn't depend on nonexistent linuxfb package

(From meta-qt5 rev: 67be00639756dd0193b090da5d759b134b2e9436)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit-examples: enable building and packaging of examples by default

Note: binaries will go into ${PN}-examples, which is qtwebkit-examples-examples

(From meta-qt5 rev: 0cf24787efdc1d20f846fd5838ec5d5b4e8ac9cf)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt: use 5.1.1 by default

(From meta-qt5 rev: 35a7c923cc280e188c287e0825ed4f2b6e1b9e08)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qttools-native: update to 5.1.1

(From meta-qt5 rev: c845e487d7ce6227f60332b5130812fc8b1e7f05)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtserialport: update to 5.1.1

(From meta-qt5 rev: 04458354f18b41e93cba5907296b2317aef1fd05)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtquickcontrols: update to 5.1.1

(From meta-qt5 rev: aeb1302888a576b6c4a7588cf299e8b6ab56d86e)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit-examples: update to 5.1.1

(From meta-qt5 rev: ca2cac7ed05de1fbcfb9a3b7544aa145e127c23b)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit: update to 5.1.1

(From meta-qt5 rev: 070247fe7c57c4a1328eefd7cb084d1612d909cd)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtlocation: don't depend on qtjsondb

jsondb is not listed a a dependencies on qtlocation in sync.profile
and was removed in more recent versions as qtjsondb is no more
maintained

(From meta-qt5 rev: 4a94c9a0f1a4c96c8bb946657f2929a4c7e7e775)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtquick1: update to 5.1.1

(From meta-qt5 rev: f3681a0c6b4d74b020051283e4f15dbfebe53865)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtsystems: don't depend on qtjsondb

(From meta-qt5 rev: 67cb9cddb10a2eb88586b09f0be2e9e55338dd24)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtsensors: update to 5.1.1

(From meta-qt5 rev: 0e5231d08eee74e3e0bc8a3324c59093a90991bc)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtscript: update to 5.1.1

(From meta-qt5 rev: 6fbf68d13ba2d82531936498a89d8b60f0914aba)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtmultimedia: update to 5.1.1

(From meta-qt5 rev: 4109beed991f8aed1c33a232fd28e6a80ab0daa1)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtimageformats: update to 5.1.1

(From meta-qt5 rev: cdca7796919242d2845d06e5814b7b8f473ed569)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtgraphicaleffects: update to 5.1.1

(From meta-qt5 rev: 5f3c5e66fa90721db651f8102c1e7bc4d03c1e37)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtdeclarative: update to 5.1.1

(From meta-qt5 rev: 976d9af04725f156d2dd8b4e0277d4ef1789d008)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtxmlpatterns: update to 5.1.1

(From meta-qt5 rev: 56eb7fdac93ece1efd720c17af48e59d1bf9c6e9)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtsvg: update to 5.1.1

(From meta-qt5 rev: d90d6ed18e0b9b5d3ecff4315945004dcf4224d8)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtjsbackend: update to 5.1.1

(From meta-qt5 rev: f40e53b1cbd8ce798490116a0484fccdb888a206)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: update to 5.1.1

- patch 10 was update
- patch 19 & 25 are merged so no more needed

(From meta-qt5 rev: 105ad2a18e20f2b07d20a1640917e69950c8496b)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

cinematicexperience: add example

for more informations on this demo :
http://kgronholm.blogspot.fr/2012/08/qt5-cinematic-experience.html
http://quitcoding.com/?page=work#cinex

(From meta-qt5 rev: 149e6b6d3730a1ff5431cdfedd2c6dbc623362b9)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

README: Add note about qtbase PACKAGECONFIG options

(From meta-qt5 rev: d43d777816cf7270e99bfdebd7660e7a07145895)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit: Export RUBYLIB to fix wrong paths hardcoded in native ruby

* when ruby-native is reused from sstate it can contain paths pointing
to wrong sysroot

(From meta-qt5 rev: d6fc754ac4145b0edf0d4bb62af1018d67ad1b64)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

maliit: Import maliit recipes from meta-oe

* Imported from rev 13ae5105ee30410136beeae66ec41ee4a8a2e2b0
  This is the first step to move these recipes over to qt5.
* maliit-framework-qt5: Build with qt5
  Switch to new github repo
  Update SRCREV and remove patches which now longer apply
  Disable doc generation and xcb
  Fix packaging
* maliit-plugins-qt5: Build with qt5.
  Switch to new github repo
  Update SRCREV and PV
  Fix packaging
* maliit-*-qt5: Adjust MKSPEC path
* meta-framework-qt5: Cleanup packaging and enable dbus activation.
  Move pkgconfig files, headers and spec files into dev.
  Cleanup packaging rules
  Enable dbus activation to start maliit server on demand
* maliit-plugins-qt5: Set MALIIT_PLUGINS_DATA_DIR to avoid path leakage from host
  If not overriden here MALIIT_PLUGINS_DATA_DIR would point to some host
  paths resulting in e.g. qml files not being found.

(From meta-qt5 rev: d691c447784646688b3b0445d63359a7d9292926)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

devshell: include PATH for qt5 native applications

If you perform a "bitbake -c devshell <some qt5 recipe>" and then try "which
qmake" in the devshell, you'll find your host's qmake is found (which is most
likely to be based on qt4) rather than the one that is built as part of
meta-qt5. The reason for this is that the qt5 items are installed to
${STAGING_DIR_NATIVE}/usr/bin/qt5 and not ${STAGING_DIR_NATIVE}/usr/bin. The
reason for the extra "qt5" directory at the end is so that qt4-based items
that are built in OE can live side-by-side with things from meta-qt5 without
interfering with each other.

This patch prepends ${STAGING_DIR_NATIVE}/usr/bin/qt5 to the devshell's PATH
so that the qt5-based native tools which are built as part of meta-qt5 will be
found before the host's.

(From meta-qt5 rev: f4188229f100349f4c88340b62a37d3ebfe51cc5)

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit: fix QA issue (bad RPATH)

Building qtwebkit causes a QA issue such that QtWebPluginProcess and
QtWebProcess contain bad RPATHs which point into the build location. This fix
adds a patch to not include the rpath.prf which causes this problem.

(From meta-qt5 rev: 918d5d9671130580bd7f31cc5b69f7be127063ae)

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtquickcontrols: Add module for 5.1.0 and git versions

(From meta-qt5 rev: f11b1722e28800c790609d0de9541f6555e1ee5a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

QtSerialPort: Add 5.1.0 version

(From meta-qt5 rev: f770c5dca9d755ebda51deb1f578f1ec43c68d8b)

Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe

* this will make maintaining meta-qt5 a bit easier

(From meta-qt5 rev: c67873216bb476935a753c3597ba91d8029f307b)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

cmake: disable test for Qt5Core

| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message):
|   The imported target "Qt5::Core" references the file
|
|      "/qmake"
|
|   but this file does not exist.  Possible reasons include:
|
|   * The file was deleted, renamed, or moved to another location.
|
|   * An install or uninstall procedure did not complete successfully.
|
|   * The installation package was faulty and contained
|
|      "tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"
|
|   but not all the files it references.
|
| Call Stack (most recent call first):
|   tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists)
|   tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:130 (include)
|   Tests/RunCMake/CMakeLists.txt:80 (find_package)

(From meta-qt5 rev: 671313d0b5e09e0b49a90ed944cd33fb3d6457b0)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qttools-native: Add module to build lrelease+lupdate+lconvert

:Release Notes:
Add optional Qt-Tools module.

:Detailed Notes:
Qt provide optional Qt-Tools like "lrelease", etc.
In absence of these tools one can not have i18n and l10n changes automated in build.
Adding "qttools-native" to "meta-qt5" Open Embedded layer provides those tools.
Using Qt-Tools i18n and l10n changes can be auomated.

:Testing Performed:

:QA Notes:

:Issues Addressed:
[GF-11028] Enable build of Qt localization tools in the Qt component

Change-Id: Ieb679249a05501a6ccb25108903a0fd48d4014f0

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit: remove examples packages

* fixes:
  NOTE: multiple providers are available for runtime qtwebkit-examples (qtwebkit-examples, qtwebkit)
  NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples
  NOTE: multiple providers are available for runtime qtwebkit-examples-dev (qtwebkit, qtwebkit-examples)
  NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples-dev

(From meta-qt5 rev: 284020d9344b6fbd88d9c6d5ff6fbaef430a775b)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit-examples: Add module

(From meta-qt5 rev: 2868f1a1838ab6a893fd01a05e61d582640a056d)

Signed-off-by: Abhijit Potnis <abhijit_potnis@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: upgrade patches for proper cmake support of native binaries at build time

(From meta-qt5 rev: 7c3a1a208df46fcf094b957cdd35f06729c53eda)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5-5.1.0: Drop negative D_P

(From meta-qt5 rev: 84c2a25417d9ddc0814f2ac34b6568051e54938e)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

Fix download url for qt5-5.0.2.

(From meta-qt5 rev: 2d61422b837acd382e52f78f7ff357b8aca9c3db)

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: be more specific in opengl switch with gl in PACKAGECONFIG

* full GL is called desktop in qtbase configure
* without this it will try to autodetect and doesn't fail when
e.g. mesa wasn't built before qtbase

(From meta-qt5 rev: c3632023e11deb9e7a862f67ad631576e73a3add)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

Revert "qtserialport: Add module"

* incorrect LIC_FILES_CHKSUMS

This reverts commit 5b19e4bd6f48cb67438306ac7bc34a524e8bec19.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5-5.0.2.inc: update path to sources

They moved the 5.0.2 sources into an archive dir upstream, this updates
the SRC_URI accordingly.

(From meta-qt5 rev: 3529eb8055a25811b522348643d41a39104089d5)

Signed-off-by: Erik Botö <erik.boto@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: add upstream QTBUG-32534 patch for QHttpMultiPart corruption

(From meta-qt5 rev: 886e8ee5bdb4c95f2e6c1c203f76bc176329454b)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5-versions: Change default version to 5.1.0

(From meta-qt5 rev: 0f7b2334268b99d3a4ea43bde735b4566f905044)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtserialport: Add module

(From meta-qt5 rev: 5b19e4bd6f48cb67438306ac7bc34a524e8bec19)

Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwayland: build and package examples applications too

(From meta-qt5 rev: d68d26ba4e539929f3949943fa6e4d5c5340afeb)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

classes: cmake_qt5: export all qt5 related paths to cmake

(From meta-qt5 rev: ee6c2abf6a6679582e28f72301f1a538ef98bf95)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: fix cmake patches to point to correct host binary directory

(From meta-qt5 rev: 4450a42aba024e8af7632074011da074479aac71)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

classes: add new cmake_qt5 class

A cmake specific qt5 class which sets all required configuration parameters to
successfully compile cmake based applications.

(From meta-qt5 rev: 6b39eda7a60597a25b9dbed823fe7f2fa8db5659)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: fix cmake files to use our host binaries

* only for qt 5.1.0; didn't had the time to port this to 5.0.2
* client recipes need to export OE_QMAKE_PATH_EXTERNAL_HOST_BINS in EXTRA_OECMAKE

(From meta-qt5 rev: 243e05f1de42d372abfecab721f8c40eee08548e)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

classes: qmake5: move QT_DIR_NAME to qmake5_paths

* qmake5_paths.bbclass refers to QT_DIR_NAME but it's defined on a higher level which
doesn't makes sense and breaks some use cases

(From meta-qt5 rev: b0100c1b5704e0216733a35ff42afab3c350bef4)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwayland: demote 5.1.0+git version a bit

* 5.0.2+git should stay default for people without qt5-versions.inc
* make sure that % isn't appended twice in qt5-versions.inc

(From meta-qt5 rev: bb4c8adeeb3107074fbf63bddf292059b370afa5)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase.inc: Fix qtbase-tools runtime depencency on perl

* While building a custom rootfs using poky, meta-oe, meta-ti
  and meta-qt5 (all on Dylan branch), I got the following error:
  [...]
  Computing transaction...error: Can't install
    qtbase-tools-5.0.2-r2.0@armv7a_vfp_neon: no package provides /usr/bin/perl
  [...]
* syncqt is perl script with /usr/bin/perl shebang, that's why rpm
  was complaining (other package managers in OE doesn't check that)

(From meta-qt5 rev: 07301a163688682b5b3e5dddada6da63593917b0)

Signed-off-by: Christian Gagneraud <chgans@gna.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtmultimedia: add gst-plugins-base dependency and openal PACKAGECONFIG

* this will need small patch in qtmultimedia.pro to run
qtCompileTest(openal) only with OE_OPENAL_ENABLED

(From meta-qt5 rev: 43872948d4bb764c723d122cac8dcc0cb1ed93c6)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwebkit: add dependency on gstreamer and libxslt

* it's autodetected from sysroot, make it deterministic
* maybe I should allow to change gst-0.10 to 1.0 without
rewriting DEPENDS

(From meta-qt5 rev: a4c346ba8f66cf06e92b3624d9487bccc19c1358)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>