Commit Graph

321 Commits

Author SHA1 Message Date
Andre McCurdy e6f2641311 qtwebkit-examples: add RDEPENDS for ca-certificates
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 09:12:13 +01:00
Andre McCurdy b7b624386c qtbase: configure with -openssl-linked instead of -openssl
Configure qtbase with -openssl-linked (instead of -openssl) to ensure
that run-time dependencies on libcryto and libssl are detected.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 09:10:08 +01:00
Mikko Levonmaa 5d4479d19d qtbase: Make it easier to change [release|debug] PACKAGECONFIG
Also add -developer-build to PACKAGECONFIG

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 09:08:23 +01:00
Denys Dmytriyenko 5599656cda nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}
* This way we don't mangle ${B} and can repeat do_install if necessary. And
  previously it would require running do_compile again to restore the proper
  state of ${B}.
* Need to bump PR, since do_compile isn't changing, but needs to re-run to
  re-populate qmake-real binary.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-20 14:22:57 -03:00
Martin Jansa 4375b28f7c qtbase-native: explicitly disable icu
* Jonathan Liu reported that qtbase-native was failing to build for him
  and it looks like qtbase-native was trying to link against icu from his
  host (instead of icu-native because it isn't in DEPENDS)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Martin Jansa d0a83ac45e qtbase: add PACKAGECONFIG for mtdev
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Andre McCurdy 0d9f550f68 qtbase.inc: don't force ARM_INSTRUCTION_SET to arm
Forcing ARM_INSTRUCTION_SET to arm when building qtbase no longer
seems to be required.

Confirmed by forcing ARM_INSTRUCTION_SET to thumb and building
qtbase 5.1.1 and 5.2.1 tuned for both armv4t and cortexa9thf-neon.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Jacob Kroon dc0073bb45 libQt5*.la references OE build directories
I'm trying to get the .la-files for Qt5 dev-packages correct.

What I've come up with so far is attached in the patch (to be applied in
top of "jansa-qt5-5.2.0", b8a236df79)

With the patch applied I can still build both an image and an SDK, and
also the resulting SDK can be used to build my QT5 autotools projects. But
I get these warnings when building for instance "qtxmlpatterns":

WARNING: QA Issue: qtxmlpatterns: The compile log indicates that host
include and/or library paths were used.

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Andreas Müller 52e39c35ee qtbase: eglfs: fix egl error for platforms only supporting one window/surface
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Andreas Müller 47ec6dbcba qtwayland.inc: fix QA warnings
WARNING: QA Issue: qtwayland: Files/directories were installed but not shipped
  /usr/lib/qt5/plugins/wayland-graphics-integration
  /usr/lib/qt5/plugins/wayland-graphics-integration/client
  /usr/lib/qt5/plugins/wayland-graphics-integration/server
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug/libwayland-egl.so

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Martin Jansa 4b7182a3be qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
  * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
  * SHA-1 of v5.2.1 tag is only in release branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Gabe Johnson 79944bda32 nativesdk-qtbase, nativesdk-qttools: Fix file search paths
* this is useful for using newer meta-qt5 with older oe-core
  release

Signed-off-by: Gabe Johnson <gjohnson@agleader.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Otavio Salvador 6e71d92786 nativesdk-qtbase: Remove the datadir as it is not installed
Fixes:

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

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-18 10:44:19 -03:00
Otavio Salvador 32cee0b6d1 nativesdk-qttools.inc: Fix installation and packaging
We must to fix the installation paths as did in nativesdk-qtbase.inc
and remove the files unused from the packages. This fixes the
packaging errors and allows for a successful build for SDK.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Denys Dmytriyenko <denys@ti.com>
2014-02-17 17:48:04 -03:00
Otavio Salvador 578657f7b6 qmake5_base.bbclass: Fix mkspec path when building nativesdk binaries
When building nativesdk binaries we ought to rely in the native
mkspecs.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Denys Dmytriyenko <denys@ti.com>
2014-02-17 17:47:27 -03:00
Otavio Salvador 8da5017712 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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-17 13:57:06 -03:00
Otavio Salvador 7d8f8d6b5a 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
  ...

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-14 19:00:40 -02:00
Otavio Salvador 7c5306107c 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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-14 18:58:40 -02:00
Denys Dmytriyenko db9d6b401c meta-toolchain-qt5: add Qt5 SDK standalone meta recipe
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2014-02-11 15:34:46 -02:00
Otavio Salvador f803570841 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.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-11 15:34:46 -02:00
Otavio Salvador 3cc5613d22 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>.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-11 15:34:46 -02:00
Otavio Salvador d768d97528 nativesdk-packagegroup-qt5-toolchain-host: Add packagegroup
Allow easy inclusion of host packages for the Qt5 standalone SDK or
external toolchain.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-07 11:39:50 -02:00
Otavio Salvador 91ac66d5e4 README: Reword the section about github forking
This splits the lines in 80 cols and rework the text a little bit to
easy reading.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-07 11:39:50 -02:00
Andreas Oberritter a317282d25 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.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-29 21:55:25 +01:00
Martin Jansa 7cca3003fa qtmultimedia.inc: Fix duplicating '{'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-29 16:23:30 +01:00
Andreas Oberritter 0b8e8124ed cmake-native: disable test for Qt5Core
Fixes the same build error as 671313d, but for the -native recipe.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-27 13:30:49 +01:00
Martin Jansa faad8d1df1 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.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-19 12:09:17 +01:00
Andreas Müller fc289452b6 qttools: add target build
this does not build much yet but I was looking for qdbus

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