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

bitbake: siggen: Fix shared work checksum mismatch/rebuild issues

Similar to the last shared work task signature bug, we've found another
one. Looking at the improved output of diffsigs in this case:

runtaskdeps changed from [
'autoconf_2.69.bb.do_populate_sysroot:virtual:native',
'gnu-config_20120814.bb.do_populate_sysroot:virtual:native',
'libgcc-initial_4.9.bb.do_patch:virtual:nativesdk'
] to [
'autoconf_2.69.bb.do_populate_sysroot:virtual:native',
'gcc-crosssdk-initial_4.9.bb.do_patch',
'gnu-config_20120814.bb.do_populate_sysroot:virtual:native'
]

so we can get a different task hash since libgcc sorts before gnu-config
and gcc sorts after it. We could do with a way of fixing this, the best
I can come up with is to include a single parent directory. Since
recipes are never at the top of any metadata trees I've seen, this
should suffice for now.

I'm planning to burn the concept of shared work within bitbake
and do something at the metadata level in the 1.8 timeframe as its just
too fragile as things stand and hard to fix well.

(Bitbake rev: fc7ebf3835a206a5daafd4e1b73bac2549714ad3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

bitbake: data_smart.py: fix variable splitting at _remove mechanism

If we split variables only at whitespaces, a slipped in tab will render
a value unremovable.

(Bitbake rev: 0da22ba3e930fbb060b31fc423fd3333ca8843a0)

Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tizen-distro: switch to tracking Yocto 1.7 ("Dizzy")

For now, Tizen uses Yocto 1.7 as base. Therefore switch to importing the
component branches for 1.7.

This works seamlessly because the current state of the tizen-distro repo
matches the branch points of each of these branches.

meta-qt5: update to revision used in tizen-distro 0.9

First ran "combo-layer update meta-qt5", then "git reset --hard"
to the commit corresponding to the code used in tizen-distro 0.9.

qtwayland: re-enable cmake files they don't break build anymore

(From meta-qt5 rev: 8b040e58b263741ea19e1826308e22ab3cae585b)

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-opengles2-test: import from meta-webos-ports

(From meta-qt5 rev: 38ddbf8b1945c657576cba4ec4a6e5199a0b7f33)

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

qt5-plugin-generic-vboxtouch: Import from meta-webos-ports

(From meta-qt5 rev: a5d4f3d649b03c60108552a0df258f4b318a0e04)

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

qttools-native 5.4.0: align source checksums

(From meta-qt5 rev: 393cdf866b138c8c5a0681f3faa3d18acfb46026)

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>

qtbwebengine: fix build for qemux86-64

* it was applied only for qtwebengine_5.3.2+git.bb, then removed
completely with 5.4.0 upgrade, but it's still needed for both
versions

(From meta-qt5 rev: 8d9a1b8b61630bc14862d4862d1340059d6f9c16)

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

qtbase: add PACKAGECONFIG for cups

(From meta-qt5 rev: d5d2aa57010a6d9488c60464b622051b3e72e705)

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

qtwebengine: Include resources in main package and add rdep on qmlplugins

(From meta-qt5 rev: 37e921db22689131144b453d53a8cce4a314aa48)

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

qt5-git: Update to 5.4.0+, latest revision in 5.4 branch

(From meta-qt5 rev: 77f262d7c7013b452b6eba11d329bcb94efde944)

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

recipes: upgrade from 5.3.2 to 5.4.0

MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc

(From meta-qt5 rev: 6566f728ab3d14a4908516fb13ad555dbfe04471)

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

nativesdk-qtbase_git: re-add OEQt5Toolchain to SRC_URI

The file is expected by do_install(), but _git version resets SRC_URI.

(From meta-qt5 rev: c9a1041cb956d94c04cbf635b00ca19725ffc129)

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>

qt5-git: Update to rc1+, latest revision in 5.4 branch

* qtwebengine LIC_FILES_CHKSUM updated because of Copyright
  year update in chromium's LICENSE
  < // Copyright (c) 2013 The Chromium Authors. All rights reserved.
  and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because
  it was including also few #include lines which were changed recently

(From meta-qt5 rev: 54c44443c34f077bfc2c5cc3a92d6db59d28343c)

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

qmake5: set OE_QMAKE_INCDIR_QT

This is set when generation an SDK, and thus would be usefull to have also
when bitbaking. That allows us to use this in *.prf files which is used
both when bitbaking as well as when using the SDK.

(From meta-qt5 rev: 5b8f470597d4f163952f3b63a8ee39a2ccabfe4c)

Signed-off-by: Anders Darander <anders@chargestorm.se>
(cherry picked from commit 96e8d29fdbdf6fa656c854d9b55c5b0c213166a7)
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtsystems: Change branch from stable to 5.3

Stable branch was removed on mainline and now 5.3
is used.

(From meta-qt5 rev: 54cf9e47a1a6b080e9154d0fe9120bf24e3a7726)

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

nativesdk-qtbase: Fix path for mkspecs in SDK

The mkspecs file needs to use the QT_DIR_NAME variable to
have a proper path to the files, fix it.

(From meta-qt5 rev: c1f6332cceee80ad2c3b4655c23b2c40d0268a5d)

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

nativesdk-qtbase: Add CMake toolchain configuration

This allow out of box use of CMake in a SDK; this includes the
subscript to properly set the host binaries path.

(From meta-qt5 rev: 05213cd7ba5d1347ae2c73d51fc52d7af1fb6938)

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

qtwebengine: whitelist supported architectures

(From meta-qt5 rev: 80496565fbb084ceb0f0d976a356a8b109c62e42)

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>

qtbase: fix path to external hostbindir binaries

This fixes syncqt.pl not being included in qtbase-tools.

(From meta-qt5 rev: ca640377e57da285ea3572096a155ea06fe39e95)

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>

qtwebengine: backport patches to fix ARM build failures

(From meta-qt5 rev: 264f20883cae2c5e5222538b3f76e2145e72b1ab)

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>

qtwebengine: simplify SRC_URI

* now when it was moved from qt-labs to qt prefix we can reuse the
SRC_URI from qt5-git.bb

(From meta-qt5 rev: 01f1ab8ee8ca31b39d097a913f9f6f8de89f5fb5)

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

qtbase: delete mkspecs/macx-ios-clang to hide QA issue

(From meta-qt5 rev: 69e1a82939d9e0f1ee22ccc7fe9bf0aa9d4b6e8a)

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

qt5: update LICENSE in git recipes

* move common part to qt5-git.bb and add GPLv2 only
in recipes which allow to use that
* for details about LGPLv3 read:
http://blog.qt.digia.com/blog/2014/08/20/adding-lgpl-v3-to-qt/

(From meta-qt5 rev: c317b18d29de9e77941417b93d124c4bf781f7ff)

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

qt5: upgrade git recipes to 5.4-beta1

(From meta-qt5 rev: 69b7d8f725b0c431d61a224dbf13a7575531404f)

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

maliit-framework-qt5: Update SRCREV

This update is needed to include fix for segfaults when change keyboard
focus while having selection.
See http://issues.webos-ports.org/issues/673 for example.
This will update SRCREV for one(also the latest) commit from master branch.

(From meta-qt5 rev: 9a4c0b393bf031acace5c2cc00d625a24c639d1c)

Signed-off-by: Nikolay Nizov <nizovn@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

nativesdk-qtbase: make it possible to keep additional libraries

In some usecases for the nativesdk, you might need some build tools that are built upon Qt5. This means
that we're having a need to keep more of the libraries build by nativsdk-qtbase. This patch adds the
infrastructure to support that

(From meta-qt5 rev: b62bda97802a3c79586e4e1c7b31f95e617cc0c8)

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

packagegroup-qt5-toolchain-target: always include qttools packages

The qttools packages were included only if the ruby layer was enabled
as it required qtwebkit. However, qttools now has a PACKAGECONFIG
option for qtwebkit and does not enable it by default so we can include
the qttools packages even if the ruby layer is not enabled.

(From meta-qt5 rev: c4de929f3824375cc4cc5a6c9082f101ea22bc84)

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

nativesdk-qtbase: Fix qtconfig.pri

The value used in the new environment subscript tried to use a target
variable which might not be accurate; use qmake to ask for the right
value for OE_QMAKE_QT_CONFIG variable.

(From meta-qt5 rev: 51a4cdf3fcdc132cc7b5af0e240c5d1007e43590)

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

Fix SDK environment setting

Since the change to use a meta-environment canadian package in the
OE-Core, the SDK environment setting has been broken. This uses the
new subscript environment to fix it and also move the environment
generation to the nativesdk-qtbase recipe.

(From meta-qt5 rev: 2f1b8fe630ac76c8ff5d184f109449b10fde5a92)

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

qtbase: don't stage the fonts directory

* the staged files conflict with fonts staged by qt4-embedded and we don't need
them in sysroot at all

(From meta-qt5 rev: 478fe949a957471a4d20450f6e9375fe1d628591)

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

qt5: upgrade git recipes to 5.4-alpha1

* introduce 2nd set of qtwayland and qtwebengine recipes, because newer
revision isn't compatible with 5.3.2 release

(From meta-qt5 rev: be2d4815efd7b8312700a426a5cafcd86a93666b)

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

qtwayland-native: remove qtwaylandscanner symlink

* it doesn't seem to be required anymore

(From meta-qt5 rev: 096112d4ab8bad1c45ab0bc40354d9a9bb3e097d)

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

qtbase: Drop dont-process configure option

* it was removed completely in 5.4 with:
commit b7d86139772c3ce662ea7f092658699d351bbb1d
Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu Jun 19 11:46:10 2014 +0200

nuke -process/-fully-process/-dont-process options

(From meta-qt5 rev: 6b83709072644663df6efbdaee566c3cf4b594fc)

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

qt*: refresh the patches

(From meta-qt5 rev: cfe122037d04fb78a8a21f7936e6822170916246)

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

qtbwebengine: fix build for qemux86-64

(From meta-qt5 rev: 3700c51c246f6aaf8ef6a3ce098578664873c096)

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

qtwebengine: update repository location

* both were moved from qt-labs to qt and chromium repo was renamed to qtwebengine-chromium

(From meta-qt5 rev: c524da4747607a770bdef7ed6773bc1c1e48f346)

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

qt5: Add Qt 5.3.2 packages

Qt 5.3.2 has been released in September 16th, 2014.

(From meta-qt5 rev: d45d3e58a954e41d97310833bc4397038d8263a7)

Signed-off-by: Yen-Chin Lee <coldnew.tw@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtwayland: Change module branch for 5.4

This is to fix the fetcher failure as the "stable" branch has been
removed. We does not change the revision we are using so this is
a safe change.

(From meta-qt5 rev: 12dac2ea1306f2ab86f8cd7b79d3d438cc6d9115)

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

qttools: fix noqtwebkit option

* it's added to CONFIG variable not QT_CONFIG

* qtwebkit was still detected and linked against
  DEBUG: qttools-tools: Dependency libQt5WebKitWidgets.so.5 requires
  package qtwebkit (used by files:
  ['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant',
   'qttools/5.3.1-r0/packages-split/qttools-plugins/usr/lib/qt5/plugins/designer/libqwebview.so'])

  DEBUG: qttools-tools: Dependency libQt5WebKit.so.5 requires package
  qtwebkit (used by files:
  ['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant'])

  DEBUG: qttools-plugins: Dependency libQt5WebKitWidgets.so.5 requires
  package qtwebkit (used by files:
  ['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant',
   'qttools/5.3.1-r0/packages-split/qttools-plugins/usr/lib/qt5/plugins/designer/libqwebview.so'])

(From meta-qt5 rev: 02861e677ab95b537efb331fb7faea4e5851d2ea)

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

qtwebkit.inc: add PACKAGECONFIG for libwebp

(From meta-qt5 rev: 5d28f842570b3546eb5b34ffd57fa94ad2a542ba)

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

qtimageformats: Make the dependencies deterministic

* jasper and libwebp were autodetected from sysroot

(From meta-qt5 rev: b0a32232e702970b7bce8b0ff1973f8e689cdff9)

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

cinematicexperience: fix qt5.3 compatibility

cinematicexperience will run failed on Qt5.3.0 and Qt5.3.1, error message
as below

------------------------------------------------------------
Qt5_CinematicExperience.qml:26:5: Type MainView unavailable
         MainView {
         ^
/content/MainView.qml:241:9: Type SettingsView unavailable
             SettingsView {
             ^
/content/SettingsView.qml:88:13: Type Switch unavailable
                 Switch {
                 ^
/content/Switch.qml:9:21: Cannot assign a value to a signal (expecting a script to be run)
         property string onText: "On"

                         ^
------------------------------------------------------------

This patch fix this issue and make cinematicexperience can run on qt5.3.

ref: http://wickwire2099.blogspot.tw/2014/05/qt-530-qt5-cinematic-experience.html

(From meta-qt5 rev: 6ce50bf97b3f3409c1dddb8d5e106e599d18e69a)

Signed-off-by: Yen-Chin Lee <coldnew.tw@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: restore QOpenGLPaintDevice-sub-area-support.patch from 5.3.0

(From meta-qt5 rev: 5111e23ae280756ff7fe7838d3b26aa66912c9ef)

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

qtbase: fix 0003-Add-external-hostbindir-option.patch

The isEmpty function takes a variable name instead of a value.
As $$[QT_EXTERNAL_HOST_BINS] is a built-in we need to assign it to a
variable to check if it is empty.

If QT_EXTERNAL_HOST_BINS is empty (as is the case for generated Qt 5
toolchains), we need to fallback to QT_HOST_BINS when determining
the path for tools such as moc otherwise you get the following error
when building a Qt project using the generated toolchain:
make[1]: /moc: Command not found

(From meta-qt5 rev: 0c5abb6ae5591be0ea26d828c95c049866d17624)

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>

tufao: Add recipe

Tufão is an asynchronous web framework for C++ built on top of Qt
inspired in Node.js.

(From meta-qt5 rev: 41ed13fbb5b9298c76dcf940e3ef77f2a9a57921)

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

qt5-demo-extrafiles: Create recipe to include extrafiles for qt5 demo.

This recipe has all the extra files required for Qt5 demo.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: 7f5c022e8cff05b18319f48b95bb94a0e0c8a3e6)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

quitindicators: Create recipe to demonstrate qt5 example.

This example shows the implementation of QUITIndicators components.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: 1d046542b60e2230989ba42479d6d1918b7a836d)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

quitbattery: Create recipe to demonstrate qt5 example.

This example demonstrates how QUItBattery could behave
in different situations.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: 723530340e8c58ba4573e0f50fcb168ff39f857f)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5nmapper: Create recipe to demonstrate qt5 example.

NMapper is a small application to experiment with normal mapping on Qt5.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: 96fb1cadc56709c670ccb416969ebfd1571f941e)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5nmapcarousedemo: Create recipe to demonstrate qt5 example.

Qt5 Nmapcarousel demonstrates the normal mapping technique using Qt5

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: ed02fe97c53d4401b610844106e2f0b29e2c2fb7)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5ledscreen: Create recipe to demonstrate qt5 example.

This is demonstration of simple LedScreen Component utilizing Qt5 QML.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: 74925c7347095aed7af484cf4e59e54cd9390b65)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtsmarthome: Create recipe to demonstrate qt5 example.

This is the Smarthome QML demo application showing interface
to control an automated house.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: 655f71d3414696370181bcc531191ed5738502a1)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qt5everywheredemo: Create recipe to demonstrate qt5 example.

Qt5 Everywhere Demo provides a quick tour of Qt 5.0, primarily
focusing on its graphical capabilities.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

(From meta-qt5 rev: 164f9aa413ce3dc93ebc5cfedecb366bcd984091)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtmultimedia: Add gstremer-1.0 support

(From meta-qt5 rev: 9f802b01e54709773e0a070beefb78d8f9d5c01f)

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

qtwebengine: Add 2 more patches to fix do_configure and fix QA warning

* otherwise moc generated files have the same basename and do_configure fails with:
  core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
  |   javascript_dialog_controller: javascript_dialog_controller.cpp
  | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
  ...

(From meta-qt5 rev: 26b7fee65a3c23a9c2447d549668f373bfa76bae)

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

qtwebengine: add initial recipe for git version only

(From meta-qt5 rev: 0663bcdddf0311329e607416cd51ce55b9557240)

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>

ninja-native: add recipe

Needed to build qtwebengine. Taken from meta-browser.

(From meta-qt5 rev: a608ef4d63ddc58528eb7defa6a7f89c71ea7033)

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: fix 0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch

* again resolves this kind of warnings:
  WARNING: QA Issue: qtxmlpatterns: The compile log indicates that host
    include and/or library paths were used. Please check the log
    '/OE/qtxmlpatterns/5.3.1-r0/temp/log.do_compile'
    for more information.

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

recipes: upgrade from 5.3.0 to 5.3.1

(From meta-qt5 rev: b26453cd28ed913d68e6ab2a0da0a13b1ce40098)

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

recipes-git: upgrade to latest SRCREV in stable branch

* this will be close to 5.3.1 release

(From meta-qt5 rev: 0d9ca1b1bd06a9f2221cbfd6b7364c74fd20f21a)

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

qttools: make qtwebkit a PACKAGECONFIG and disable by default

(From meta-qt5 rev: 82dbbfe81e6f85b7265f0b76b9682edf0acfbaea)

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>

qtwayland: respect OE_QMAKE_PATH_QT_HEADERS and use QT_VERSION variable

* QT_VERSION allows to use 5.3.1 e.g. when overriding SRCREV
* ${includedir}/${QT_DIR_NAME} is the default value of OE_QMAKE_PATH_QT_HEADERS, but
when it's changed by user we should respect it here

(From meta-qt5 rev: aa8588a72e9c611bf98c9318397bc9a1a26a2655)

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

qtwayland: Don't use bashisms in do_install

(From meta-qt5 rev: 890d699834f0294d3d25373dcb76205e5994302d)

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

maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files

(From meta-qt5 rev: 32b4764e9122531a581f46d318136b6769926d36)

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

qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5

(From meta-qt5 rev: b4e270f9e2e5c632f0958af1a5131efb45bcd799)

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

qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5

* move more patches to "shared" section

(From meta-qt5 rev: 06c25e6a6b9ff6f36f91412b2f8e10e8cd39bf3b)

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

recipes-git: Use LIC_FILES_CHKSUM from .inc files

* the old checksum was introduced in .inc files in upgrade of
  tarball recipes to 5.3.0, use that until it's updated in
  git recipes and then we'll have to move old checksum from .inc
  to release recipe only.

(From meta-qt5 rev: 96c33dfbedacb94a216f7aede7d6d654a7d27953)

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

recipes-git: Upgrade to latest origin/stable

* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3

(From meta-qt5 rev: cf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff)

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

packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets

(From meta-qt5 rev: a0da57e5ce2862758e10b82c30c200e365b29f46)

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>

qtenginio: Add new module

(From meta-qt5 rev: 28e4936d70da85c5641e2f7ae38eb0793ddfc40a)

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>

qtwebsockets: Add new module

(From meta-qt5 rev: e47180cf1f010547d682bf5ca04b3287b14161f2)

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: upgrade from 5.2.1 to 5.3.0

(From meta-qt5 rev: e9ad98bbed6065989ef4648e724f27275b35b838)

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>

recipes-git: Upgrade from latest origin/release to latest origin/stable

* there wont be 5.2.2 release, so start preparation for 5.3.0
* probably latest 5.3.0-beta1 snapshot was released yesterday, so this
  should be reasonably close
* probably wont be merged before creating new release branch for Yocto 1.6
* qtbase: Fix build with X.h included from egl.h
* nativesdk-qt*: Add git recipes
  5.2.1 isn't compatible with qtbase-native from git
* qtbase: upgrade to latest stable revision
  * 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
    was upstreamed in:
    0c3301f configure: make pulseaudio and alsa configurable options
  * 0005-qt_module-Fix-pkgconfig-replacement.patch
    is hopefully resolved in:
    eaefbe3 snuff -L/-I with system paths when installing meta files
    a33afed de-duplicate setup of libdir replacement in prl files
    aa20e7f reshuffle code for clarity
    ee86ce8 don't attempt to replace include paths in meta files
    but this needs to be double checked
* recipes-git: Upgrade to latest origin/stable
* qt5-git.inc: update LICENSE.LGPL checksum
  * only year was updated:
    - The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
    + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
* qtbase: add 2 patches to fix build issues
* LIC_FILES_CHKSUM: update other git recipes
* qtlocation: bump SRCREV and add to qt5-versions
* qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools
* qtquick1: fix LIC_FILES_CHKSUM
* qttools: update LIC_FILES_CHKSUM and patches
  * new qtdiag needs to be disabled as well because it depends on gui which isn't enabled
    in qtbase-native, disable qtpaths as well

(From meta-qt5 rev: 6374736f37378501793a5191b48545c1fecc0c48)

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

qt5.inc: Fix packaging of plugins

The qtmultimedia module install the plugins in a sub-directory however
those were not being packaged. This patch fixes following QA error:

ERROR: QA Issue: qtmultimedia: Files/directories were installed but not shipped
  /usr/lib/qt5/plugins/video
  /usr/lib/qt5/plugins/video/videonode
  /usr/lib/qt5/plugins/video/videonode/libimx6vivantevideonode.so
  /usr/lib/qt5/plugins/video/videonode/.debug
  /usr/lib/qt5/plugins/video/videonode/.debug/libimx6vivantevideonode.so

Reported-by: Lauren Post <lauren.post@freescale.com>
(From meta-qt5 rev: 9957ec5d0176912e189cf7e243617ed9c3cde57a)

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

qtwayland: install created private headers, v2

* I've accidentaly merged v1 of this patch, so this is just
missing part from PATCHv2.

(From meta-qt5 rev: ed05b91f137cb229e9ebababf9f72748aece1bf3)

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>

qtwayland: install created private headers

buildhistory diff:

(From meta-qt5 rev: 790d43aae5d55d2695b7a1406f425ffca01068b2)

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

qtwayland-native: make qtwayland find qtwaylandscanner

bindir/qt5 causes not building QtWaylandClient files.
See [1] for further explanation. This error was discoverd by building
hawaii-shell failing with:

| /home/superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlinputdevice_p.h:56:58: fatal error: QtCompositor/private/qwayland
| #include <QtCompositor/private/qwayland-server-wayland.h>
| ^
| compilation terminated.

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

(From meta-qt5 rev: 925fcf4ecfe5f0e8f6dd76a1cf6e4b719551e493)

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>

qtwayland: move to latest revision

latest hawaii has moved to frame-sync support

(From meta-qt5 rev: bb39cdb7cc2a964d1cecd1a4109cfae50dba964b)

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: add -no-xkbcommon

If one builds with xkb, both -no-xkb and
-no-xkbcommon should be set.
Without -no-xkbcommon you'll get link-errors
for libcomposeplatforminputcontextplugin.so

(From meta-qt5 rev: 82595860225ee056e1291282c7bd4b0d4ed8036d)

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

qtsystems: Remove examples.pro file from packages

The examples.pro file is useless as we don't deploy the
source code. Remove it from the packages.

(From meta-qt5 rev: 48311c05e264ee52d6a8cb7ef8d004345777dfda)

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

qtbase: Remove examples.pro file from packages

The examples.pro file is useless as we don't deploy the
source code. Remove it from the packages.

(From meta-qt5 rev: 6302f024037605f9ffd09009850c902f378809b1)

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

packagegroup-qt5-toolchain-target: Don't require qtquickcontrols-qmlplugins

The qtquickcontrols-qmlplugins requirement has been move to a runtime
recommendation so we don't fail in case it is not available.

(From meta-qt5 rev: 7dd1fcdecb4c20156fa88edf8d3f090b9b8692cd)

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

populate_sdk_qt5.bbclass: Fix PACKAGE_GROUP deprecation warning

Fixes the following warning:

WARNING: PACKAGE_GROUP is deprecated, please use FEATURE_PACKAGES instead

(From meta-qt5 rev: 05ed65d22578296d5ef145ec20e6e7bb7b434c9b)

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

qtbase: add xcb-util-renderutil to xcb PACKAGECONFIG

* also force xcb-xlib and system-xcb just for consistency (configure script
will disable xcb-xlib when compile-test fails)
* fixes test-dependencies issue:
qtbase/qtbase-plugins/latest lost dependency on libxcb-render xcb-util-renderutil

(From meta-qt5 rev: 381717aa35f5e489fab40b06619d42348a5b1d7e)

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

qtbase: xinput2 depends on libxi

| ../../../../qtbase-opensource-src-5.2.1/config.tests/x11/xinput2/xinput2.cpp:43:36: fatal error: X11/extensions/XInput2.h: No such file or directory
| #include <X11/extensions/XInput2.h>
| ^
| compilation terminated.
| make: *** [xinput2.o] Error 1
| XInput2 disabled.
| XInput2 support cannot be enabled due to functionality tests!

(From meta-qt5 rev: 6b1ad9ef455e048802f41b5d446cc3ac9c3bdfb6)

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>

qtbase: enable xkb by default if x11 is in DISTRO_FEATURES

Fixes "Error: -no-xkbcommon is not supported on XCB platform plugin."

(From meta-qt5 rev: 3d2eca97d6439aad6b34654bc8fd67834b764572)

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>

cmake: remove .bbappends, resolved in oe-core

* it's included in daisy and master branches
http://git.openembedded.org/openembedded-core/commit/?h=daisy&id=4f2dee0d8c2c3f60cb8f8021343e973cae31fc50

(From meta-qt5 rev: 17f240dfa98e49f14637fd146ba1de20416d0971)

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

qtlocation: add packageconfig for geoclue and gypsy

(From meta-qt5 rev: 12a40b841225b0d669b330dbdec1a01b0a99ddaa)

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>

qtwebkit: fix packageconfig

Arguments passed to the qmake command-line were ignored by prf
files, which get evaluated first. QtWebKit offers QMAKE_CACHE_EVAL,
which can be used to inject a qmake snippet before anything else
gets parsed.

(From meta-qt5 rev: 7a8f5fe098c4a553249710f6869c01bac888d398)

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>

qtwebkit: add packageconfig for qtmultimedia

(From meta-qt5 rev: c49617bd7a7c0f4e9539e64e2468d6ed281540d7)

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>

packagegroup-qt5-toolchain-target: include all modules for development

This adds the necessary target packages for development with all of the
Qt 5 modules.

(From meta-qt5 rev: 4b000961f3aa3da0717062e7dc0f54cfe0a0288c)

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

qtimageformats: allow empty qtimageformats package

This fixes installing qtimageformats-dev with opkg as it depends on the
qtimageformats package which wasn't created.

The qtimageformats package was not created as it is empty and BitBake
avoids producing empty packages by default. The installed files consist
of source files split into qtimageformats-dbg, CMake files split into
qtimageformats-dev, plugins split into qtimageformats-plugins and
debug build of plugins split into qtimageformats-plugins-dbg.

(From meta-qt5 rev: c9c0b501f69e3fc5ea92bf36a06d7c701a988014)

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

licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4

The license agreement doesn't mention Nokia anymore after Qt was
acquired by Digia.

(From meta-qt5 rev: 1fa7f364f682e5cfaa9d6e565b7ae6b8ec2a90ff)

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>

licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider

* Provide the license text

(From meta-qt5 rev: 79fcaa9d61fbecdcf2d75efb00682b66ba9deeb6)

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

qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1 recipe

(From meta-qt5 rev: 818cc2d11b02ceb02ac27401fedcaf1e1db91d36)

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

qtdeclarative_git: drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch

* drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
  because it's already applied in upstream commit:
  commit d765ad8e3dabe44f276db9084b1d16164c4535e7
  Author: Florian Hänel <florian.haenel@basyskom.com>
  Date:   Wed Jun 5 19:23:32 2013 +0200
  Subject: Fix wrong calculation of viewPort for transitions

(From meta-qt5 rev: a93ebb736bb02c1c74bb8a4bd14476c725905ea3)

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

qt5-git: bump SRCREVs to latest in 'release' branch

* in some components there was just
  Bump MODULE_VERSION to 5.2.2
  commit but bump them all for consistencty

* we're testing newer revisions in order to narrow some QML issues
  we're seeing in runtime

(From meta-qt5 rev: fbf9216fb9753e32618f1bf986e136423171b313)

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