Commit Graph

293 Commits

Author SHA1 Message Date
Martin Jansa
b8a236df79 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-12 15:03:21 +01:00
Andreas Müller
0b4bdeb6c1 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] e25a4faf4a

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2014-01-12 15:03:21 +01:00
Martin Jansa
c908fe4ebd 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

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-12 15:01:37 +01:00
Martin Jansa
775d77e482 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-01 12:54:50 +01:00
André Draszik
57709a4ee2 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.

Signed-off-by: André Draszik <andre.draszik@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-12-21 19:48:14 +01:00
Martin Jansa
72ca958ebf qtlocation, qtsystems: Fix QT_MODULE_BRANCH
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-12-12 16:32:02 +01:00
Denys Dmytriyenko
343101669c 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.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-12-12 16:32:02 +01:00
Denys Dmytriyenko
512c859380 nativesdk-qttools: add nativesdk version of qttools necessary for SDK tools
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-12-12 16:32:02 +01:00
Denys Dmytriyenko
7b898fdc66 nativesdk-qtbase: add nativesdk version of qtbase necessary for SDK tools
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-12-12 16:31:58 +01:00
Martin Jansa
662ff3043a cmake: Rename .bbappend to match new version from oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-15 18:52:03 +01:00
Martin Jansa
7327781083 qtwayland: Fix Project ERROR: Module v8 has no public API
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-04 23:12:21 +01:00
Martin Jansa
a6753fa646 maliit-framework-qt5: Add missing dependency on qtdeclarative
* it needs also quick and qml, so qtbase wasn't enough

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-04 12:13:11 +01:00
Martin Jansa
d6c3d39a70 maliit-framework-qt5: Add missing dependency on qtbase
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-03 22:39:09 +01:00
Martin Jansa
faa07fc3a6 cmake: Rename and update .bbappend to match new version from oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-03 22:39:09 +01:00
Iktwo Sh
f11778340c qtx11extras: Add recipe
Signed-off-by: Iktwo Sh <elmaildeliktwo@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-03 22:38:58 +01:00
Nicolas Dechesne
ffe8a0e0ad 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

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-03 22:38:58 +01:00
Kristofer Hansson Aspman
9f0f1dc647 qtconnectivity: Add recipe.
Signed-off-by: Kristofer Hansson Aspman <kristofer.hansson-aspman@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-03 22:38:52 +01:00
Jonathan Liu
c36be1724a qtbase: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patch
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-29 11:48:47 +01:00
Simon Busch
84cd4be249 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.

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-21 11:54:12 +02:00
Simon Busch
a5de4e3856 maliit-plugins-qt5: add dependency on libqt5svg-plugins
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-20 14:56:34 +02:00
Simon Busch
3763998ed0 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.

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-20 14:55:44 +02:00
Simon Busch
5ecfb7dc54 maliit-frameworks-qt5: provide ${datadir} also by EXTRA_QMAKEVARS_PRE
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-20 14:55:41 +02:00
Martin Jansa
e1d2257f60 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....

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-12 19:03:49 +02:00
Martin Jansa
4c177a661f 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....

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-11 22:12:19 +02:00
Martin Jansa
af6014e3bc qtbase: Disable fontconfig by default
* it was explicitly disabled in
  commit 1b14686657
  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 ebdd83f6b7
  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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-10 12:39:36 +02:00
Martin Jansa
3e95350611 qtbase_git: restore 0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch in SRC_URI
* commit 105ad2a18e
  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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-10 12:36:47 +02:00
Jonathan Liu
096a380851 qtbase: add upstream QTBUG-31579 patch for QPainter regression
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-10 12:35:18 +02:00
Eric BENARD
ee4ef2a303 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

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
jansa/test-2013-10-08
2013-10-08 17:56:23 +02:00
Martin Jansa
040dd25bed qtjsondb: Remove unsupported module
* https://bugreports.qt-project.org/browse/QTBUG-31741

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Andreas Müller
2ecccc2ca2 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.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Denys Dmytriyenko
67be006397 qtbase.inc: PACKAGECONFIG[linuxfb] shouldn't depend on nonexistent linuxfb package
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Denys Dmytriyenko
0cf24787ef qtwebkit-examples: enable building and packaging of examples by default
Note: binaries will go into ${PN}-examples, which is qtwebkit-examples-examples

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>
2013-10-08 15:50:10 +02:00
Eric Bénard
35a7c923cc qt: use 5.1.1 by default
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Eric Bénard
c845e487d7 qttools-native: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Eric Bénard
04458354f1 qtserialport: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Eric Bénard
aeb1302888 qtquickcontrols: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Eric Bénard
ca2cac7ed0 qtwebkit-examples: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
070247fe7c qtwebkit: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
4a94c9a0f1 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

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
f3681a0c6b qtquick1: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
67cb9cddb1 qtsystems: don't depend on qtjsondb
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
0e5231d08e qtsensors: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
6fbf68d13b qtscript: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
4109beed99 qtmultimedia: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
cdca779691 qtimageformats: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
5f3c5e66fa qtgraphicaleffects: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
976d9af047 qtdeclarative: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
56eb7fdac9 qtxmlpatterns: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
d90d6ed18e qtsvg: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Eric Bénard
f40e53b1cb qtjsbackend: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00