Commit Graph

379 Commits

Author SHA1 Message Date
Andreas Müller
82dbbfe81e qttools: make qtwebkit a PACKAGECONFIG and disable by default
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-25 16:02:18 +02:00
Martin Jansa
aa8588a72e 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-13 13:44:45 +02:00
Martin Jansa
890d699834 qtwayland: Don't use bashisms in do_install
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 13:04:01 +02:00
Martin Jansa
32b4764e91 maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
b4e270f9e2 qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
06c25e6a6b qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5
* move more patches to "shared" section

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
96c33dfbed 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.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
cf2c7816fd recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
a0da57e5ce packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
28e4936d70 qtenginio: Add new module
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
e47180cf1f qtwebsockets: Add new module
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
e9ad98bbed qt5: upgrade from 5.2.1 to 5.3.0
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Martin Jansa
6374736f37 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Otavio Salvador
9957ec5d01 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>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-06-06 13:37:29 -03:00
Andreas Müller
ed05b91f13 qtwayland: install created private headers, v2
* I've accidentaly merged v1 of this patch, so this is just
  missing part from PATCHv2.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 14:40:10 +02:00
Andreas Müller
790d43aae5 qtwayland: install created private headers
buildhistory diff:

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Andreas Müller
925fcf4ecf 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] 0e1ce36ae6

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Andreas Müller
bb39cdb7cc qtwayland: move to latest revision
latest hawaii has moved to frame-sync support

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Thomas Senyk
8259586022 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Otavio Salvador
48311c05e2 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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-05-28 10:24:41 -03:00
Otavio Salvador
6302f02403 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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-05-28 10:24:41 -03:00
Otavio Salvador
7dd1fcdecb 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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-05-28 10:24:41 -03:00
Jacob Kroon
05ed65d225 populate_sdk_qt5.bbclass: Fix PACKAGE_GROUP deprecation warning
Fixes the following warning:

WARNING: PACKAGE_GROUP is deprecated, please use FEATURE_PACKAGES instead

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:23 +02:00
Martin Jansa
381717aa35 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Andreas Oberritter
6b1ad9ef45 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!

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Andreas Oberritter
3d2eca97d6 qtbase: enable xkb by default if x11 is in DISTRO_FEATURES
Fixes "Error: -no-xkbcommon is not supported on XCB platform plugin."

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Martin Jansa
17f240dfa9 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Jonathan Liu
12a40b8412 qtlocation: add packageconfig for geoclue and gypsy
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Andreas Oberritter
7a8f5fe098 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.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-04-20 16:28:54 +02:00
Jonathan Liu
c49617bd7a qtwebkit: add packageconfig for qtmultimedia
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-04-20 16:28:54 +02:00
Jonathan Liu
4b000961f3 packagegroup-qt5-toolchain-target: include all modules for development
This adds the necessary target packages for development with all of the
Qt 5 modules.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-03-29 17:16:51 -03:00
Jonathan Liu
c9c0b501f6 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.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-03-29 17:16:51 -03:00
Jonathan Liu
1fa7f364f6 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.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-15 18:52:45 +01:00
Khem Raj
79fcaa9d61 licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
* Provide the license text

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-15 14:47:28 +01:00
Martin Jansa
818cc2d11b qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1 recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
5.2.1+origin/release
2014-03-07 01:39:24 +01:00
Martin Jansa
a93ebb736b 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:31:03 +01:00
Martin Jansa
fbf9216fb9 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:31:03 +01:00
Martin Jansa
a036792a62 qtbase: Replace 0012-qtbase-allow-build-of-examples.patch with -compile-examples option
* -compile-examples option was added in upstream commit:
  commit 8ea19caacf281240411541b5af37c2f9a103a7d1
  Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
  Date:   Tue May 7 17:10:22 2013 +0200
  Subject: add -compile-examples configure option

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:31:03 +01:00
Andreas Müller
fc06fb8ceb qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms]
* there is no kms around
* mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms)
* in configure we find:
  | if [ "$CFG_KMS" = "yes" ]; then
  |     if [ "$CFG_EGL" = "no" ]; then
  |         echo "The KMS plugin requires EGL support and cannot be built"
  |         exit 101
  |     fi
  | fi

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:28:46 +01:00
Jonathan Liu
201b3b2c89 qtbase: prevent artifacts on raster windows using eglfs plugin
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:25:36 +01:00
Jonathan Liu
8c3c6fda69 qtbase: fix mmsize argument parsing for linuxfb plugin
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:25:24 +01:00
Jonathan Liu
ea5d8e0c1b cmake: rename .bbappend to match new version from OE-core
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Jonathan Liu
c63c48b3ca qttools: add missing DEPENDS
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Andreas Oberritter
2bf30ae1d5 qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors
Use gstreamer for 1.x, gstreamer010 for 0.10.x.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Andreas Oberritter
c9e332597b qtdeclarative: drop qtsvg dependency, add packageconfig for qtxmlpatterns
The dependency on qtsvg seems to be a leftover from an old version.
Version 5.2.1 of qtdeclarative doesn't include any reference to it.

Depend on qtbase in case qtxmlpatterns gets disabled.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Andreas Oberritter
69d2f31df6 qtbase/qtwebkit: drop ICU variable
Pango doesn't seem to be a drop-in replacement for ICU, so
using it as a dependency for the -icu option won't work.

QtWebKit has a hard dependency on icu.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Otavio Salvador
deb2473ee9 populate_sdk_qt5.bbclass: Add support for qtcreator-debug
This adds a new image feature for easier remote debugging with
QtCreator.

The qtcreator-debug needs to be added as a valid item for image
features and having it inside the populate_sdk_qt5 is too late. User
will see a parser error as OE-Core images does not inherit the classs.
The possible workaround for it is to include it inside layer.conf file
until a kind of "bbclassappend" support is in place.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Giulian Vivan <giulian@ossystems.com.br>
2014-02-28 10:47:04 -03:00
Otavio Salvador
53242713da packagegroup-qt5-qtcreator-debug: Add package group
This allow for easy installation of needed packages for remote
debugging using QtCreator. The qtdeclarative-plugins package provides
the needed infrastructure to remotely debug QML application.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Giulian Vivan <giulian@ossystems.com.br>
2014-02-28 10:47:04 -03:00
Jacob Kroon
cee2a75ad6 nativesdk-qtbase-tools: disable Debian-style package renaming
Since commit 8da5017712, libQt5*.so files
are included in the nativesdk-qtbase-tools package. However, this together
with the fact that the binaries are placed in a subdir "qt5" of bin will
confuse the Debian-style package renaming logic in debian.bbclass, causing the
resulting ipk package to be created as "nativesdk-libqt5core5".

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-28 10:46:58 -03:00
Otavio Salvador
e55d3ef36a populate_sdk_qt5.bbclass: Fix symlink location for QtCreator use
The QtCreator is quite broken regarding finding the mkspecs files; so
to workaround it we must to add a symlink to it. The workaround was in
place but in the wrong sysroot, it must to be in the /native/ one.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Jonathan Liu <net147@gmail.com>
2014-02-25 08:36:57 -03:00