Simon Busch [Wed, 25 Jun 2014 07:55:16 +0000 (09:55 +0200)]
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>
Martin Jansa [Wed, 2 Jul 2014 15:28:17 +0000 (17:28 +0200)]
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>
Martin Jansa [Wed, 25 Jun 2014 13:47:15 +0000 (15:47 +0200)]
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>
Martin Jansa [Tue, 24 Jun 2014 13:26:03 +0000 (15:26 +0200)]
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>
Andreas Müller [Sat, 14 Jun 2014 00:01:57 +0000 (02:01 +0200)]
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>
Martin Jansa [Thu, 12 Jun 2014 02:26:30 +0000 (04:26 +0200)]
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>
Martin Jansa [Tue, 10 Jun 2014 11:03:55 +0000 (13:03 +0200)]
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>
Martin Jansa [Thu, 5 Jun 2014 20:17:17 +0000 (22:17 +0200)]
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>
Martin Jansa [Wed, 4 Jun 2014 15:12:58 +0000 (17:12 +0200)]
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>
Martin Jansa [Wed, 4 Jun 2014 14:50:53 +0000 (16:50 +0200)]
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>
Martin Jansa [Fri, 30 May 2014 13:15:53 +0000 (15:15 +0200)]
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>
Martin Jansa [Fri, 30 May 2014 12:37:26 +0000 (14:37 +0200)]
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>
Jonathan Liu [Fri, 30 May 2014 11:05:21 +0000 (13:05 +0200)]
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>
Jonathan Liu [Fri, 30 May 2014 11:05:21 +0000 (13:05 +0200)]
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>
Jonathan Liu [Fri, 30 May 2014 11:05:21 +0000 (13:05 +0200)]
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>
Jonathan Liu [Thu, 29 May 2014 14:54:38 +0000 (00:54 +1000)]
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>
Martin Jansa [Wed, 19 Mar 2014 14:30:56 +0000 (15:30 +0100)]
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>
Otavio Salvador [Fri, 6 Jun 2014 15:02:05 +0000 (12:02 -0300)]
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>
Andreas Müller [Tue, 13 May 2014 14:48:48 +0000 (16:48 +0200)]
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>
Andreas Müller [Mon, 12 May 2014 09:41:38 +0000 (11:41 +0200)]
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>
Andreas Müller [Mon, 12 May 2014 09:41:37 +0000 (11:41 +0200)]
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>
Andreas Müller [Mon, 12 May 2014 09:41:36 +0000 (11:41 +0200)]
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>
Thomas Senyk [Thu, 27 Mar 2014 14:33:07 +0000 (15:33 +0100)]
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>
Otavio Salvador [Mon, 26 May 2014 14:01:18 +0000 (11:01 -0300)]
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>
Otavio Salvador [Mon, 26 May 2014 14:00:09 +0000 (11:00 -0300)]
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>
Otavio Salvador [Sat, 24 May 2014 22:50:59 +0000 (19:50 -0300)]
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>
Jacob Kroon [Tue, 15 Apr 2014 17:12:45 +0000 (19:12 +0200)]
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>
Martin Jansa [Tue, 6 May 2014 20:14:38 +0000 (22:14 +0200)]
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>
Andreas Oberritter [Fri, 25 Apr 2014 22:51:40 +0000 (00:51 +0200)]
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>
Andreas Oberritter [Fri, 25 Apr 2014 22:51:39 +0000 (00:51 +0200)]
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>
Martin Jansa [Sun, 20 Apr 2014 14:51:37 +0000 (16:51 +0200)]
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>
Jonathan Liu [Sun, 20 Apr 2014 14:01:23 +0000 (00:01 +1000)]
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>
Andreas Oberritter [Thu, 10 Apr 2014 22:15:44 +0000 (00:15 +0200)]
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>
Jonathan Liu [Sun, 30 Mar 2014 13:22:52 +0000 (00:22 +1100)]
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>
Jonathan Liu [Wed, 12 Mar 2014 22:52:40 +0000 (09:52 +1100)]
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>
Jonathan Liu [Wed, 12 Mar 2014 22:52:39 +0000 (09:52 +1100)]
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>
Jonathan Liu [Sat, 15 Mar 2014 14:54:39 +0000 (01:54 +1100)]
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>
Khem Raj [Fri, 14 Mar 2014 14:47:26 +0000 (07:47 -0700)]
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>
Martin Jansa [Fri, 7 Mar 2014 00:39:24 +0000 (01:39 +0100)]
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>
Martin Jansa [Mon, 24 Feb 2014 22:55:52 +0000 (23:55 +0100)]
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>
Martin Jansa [Mon, 24 Feb 2014 20:20:58 +0000 (21:20 +0100)]
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>
Martin Jansa [Mon, 24 Feb 2014 20:02:34 +0000 (21:02 +0100)]
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
(From meta-qt5 rev:
a036792a6270f18c971baeb72f92abbb91c4d73e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Andreas Müller [Tue, 25 Feb 2014 17:16:54 +0000 (18:16 +0100)]
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
(From meta-qt5 rev:
fc06fb8ceb8eec4fe64463234ce6aaadd5f8a852)
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>
Jonathan Liu [Tue, 4 Mar 2014 22:09:39 +0000 (09:09 +1100)]
qtbase: prevent artifacts on raster windows using eglfs plugin
(From meta-qt5 rev:
201b3b2c89d77a6ef8ea6e5f6b63929429184994)
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>
Jonathan Liu [Tue, 4 Mar 2014 22:09:00 +0000 (09:09 +1100)]
qtbase: fix mmsize argument parsing for linuxfb plugin
(From meta-qt5 rev:
8c3c6fda694f8d86347d51978d345d476addf59f)
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>
Jonathan Liu [Mon, 3 Mar 2014 10:59:53 +0000 (21:59 +1100)]
cmake: rename .bbappend to match new version from OE-core
(From meta-qt5 rev:
ea5d8e0c1b04719e1606d823292d0beb1bae7cc2)
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>
Jonathan Liu [Mon, 3 Mar 2014 07:00:03 +0000 (18:00 +1100)]
qttools: add missing DEPENDS
(From meta-qt5 rev:
c63c48b3ca8d7fd824b471fbac5e96bc1600e380)
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>
Andreas Oberritter [Fri, 28 Feb 2014 20:15:07 +0000 (21:15 +0100)]
qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors
Use gstreamer for 1.x, gstreamer010 for 0.10.x.
(From meta-qt5 rev:
2bf30ae1d5321803acc0f15f49935dac50089dde)
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>
Andreas Oberritter [Fri, 28 Feb 2014 20:15:06 +0000 (21:15 +0100)]
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.
(From meta-qt5 rev:
c9e332597bd461de03dbb0eed429ecbe0c9a05a5)
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>
Andreas Oberritter [Fri, 28 Feb 2014 20:15:05 +0000 (21:15 +0100)]
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.
(From meta-qt5 rev:
69d2f31df603244dff240163df04133756a1a0d3)
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>
Otavio Salvador [Thu, 20 Feb 2014 17:34:01 +0000 (14:34 -0300)]
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.
(From meta-qt5 rev:
deb2473ee91c014c655098f20b9f8b33ff9a8bc1)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Giulian Vivan <giulian@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Thu, 20 Feb 2014 17:31:13 +0000 (14:31 -0300)]
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.
(From meta-qt5 rev:
53242713da6ae01f2b1f7e674b00517390fe2bcb)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Giulian Vivan <giulian@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Jacob Kroon [Fri, 28 Feb 2014 09:33:52 +0000 (10:33 +0100)]
nativesdk-qtbase-tools: disable Debian-style package renaming
Since commit
8da5017712a7ddcb8488e095b9aa03b0273f23e9, 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".
(From meta-qt5 rev:
cee2a75ad66080a1b8694238ee5cfe2570225e4d)
Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Mon, 24 Feb 2014 15:39:34 +0000 (12:39 -0300)]
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.
(From meta-qt5 rev:
e55d3ef36a98574e7d4535bb03b56c9a05e6578a)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Giulian Gonçalves Vivan [Tue, 18 Feb 2014 20:44:55 +0000 (17:44 -0300)]
qsiv: add the qsiv 1.1 example app
This provides a simple image viewer for demonstration purposes.
(From meta-qt5 rev:
0d20b53eb8b4c8d09ee8281efbd045aa1561b08c)
Signed-off-by: Giulian Gonçalves Vivan <giulian@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Thu, 20 Feb 2014 17:22:32 +0000 (14:22 -0300)]
mallit-plugins-qt5: Don't set OE_QMAKE_PATH_HEADERS
The qmake class now respects the QT_DIR_NAME setting when setting the
headers path, so this change is not needed anymore.
(From meta-qt5 rev:
9b4dc4d2cf9de6e037df70684d7f6cfee7e4905b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Thu, 20 Feb 2014 17:21:23 +0000 (14:21 -0300)]
mallit-framework-qt5: Don't set OE_QMAKE_PATH_HEADERS
The qmake class now respects the QT_DIR_NAME setting when setting the
headers path, so this change is not needed anymore.
(From meta-qt5 rev:
8222990922ac75f805f649499a2be803da6b6a3b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Tue, 18 Feb 2014 17:03:49 +0000 (14:03 -0300)]
qmake5_paths.bbclass: Use Qt version path for headers
When looking for Qt5 headers we ought to use the Qt5 specific path. In
case the distribution wants to have a flat tree it can set QT_DIR_NAME
and it will still works as expected.
(From meta-qt5 rev:
2bd5fba34dd350807ac07828cd883d5b6c7ec631)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 22 Feb 2014 16:27:23 +0000 (17:27 +0100)]
qtwayland: Fix xcomposite-glx and examples build
* egl was building fine, but glx was failing to find
qwaylandintegration.h
* one example cannot be built without gles2, so make it
conditional
(From meta-qt5 rev:
d8b22f3d4ad6e15ab666b714fa0911a1bc289434)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 22 Feb 2014 16:26:42 +0000 (17:26 +0100)]
qtdeclarative: Fix build with tests enabled
(From meta-qt5 rev:
1279a21d9db9c497efbdaef7bb45f313a06df44b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 22 Feb 2014 13:18:06 +0000 (14:18 +0100)]
qtbase: Fix PACKAGECONFIG[tests]
* at least in 5.2.1 tests aren't enabled by default:
QT_ALL_BUILD_PARTS=" libs tools examples tests "
QT_DEFAULT_BUILD_PARTS="libs tools examples"
so without -make option they weren't enabled even with tests in
PACKAGECONFIG
* add options for other build parts just for completeness
(From meta-qt5 rev:
6ec88245642cfe16bdd21abdbb8f3fabe13c96b9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 22 Feb 2014 08:14:12 +0000 (09:14 +0100)]
qtbase: Move remaining few by default enabled options to PACKAGECONFIG_DEFAULT
* more and more people don't want to redefine whole PACKAGECONFIG variable
(From meta-qt5 rev:
04013e13b1368d86dfa6567807a3345b1de1dc6b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Andre McCurdy [Sat, 22 Feb 2014 05:30:07 +0000 (21:30 -0800)]
qtwebkit-examples: add RDEPENDS for ca-certificates
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.
(From meta-qt5 rev:
e6f2641311118bc2169a9a43f2ff2d21a18f4572)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Andre McCurdy [Sat, 22 Feb 2014 05:30:06 +0000 (21:30 -0800)]
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.
(From meta-qt5 rev:
b7b624386cb736b0f9ff5529e92059fb97d9787d)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Fri, 21 Feb 2014 22:49:56 +0000 (14:49 -0800)]
qtbase: Make it easier to change [release|debug] PACKAGECONFIG
Also add -developer-build to PACKAGECONFIG
(From meta-qt5 rev:
5d4479d19ddccbab0efec2c85b646b35a2f7c2bc)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Denys Dmytriyenko [Thu, 20 Feb 2014 17:12:11 +0000 (12:12 -0500)]
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.
(From meta-qt5 rev:
5599656cda1728b7262a9ae7154759dcd40a874e)
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>
Martin Jansa [Tue, 18 Feb 2014 15:36:44 +0000 (16:36 +0100)]
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)
(From meta-qt5 rev:
4375b28f7c70b033ee416df153498e9f76396025)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 18 Feb 2014 10:26:05 +0000 (11:26 +0100)]
qtbase: add PACKAGECONFIG for mtdev
(From meta-qt5 rev:
d0a83ac45e108aba76c96a432d4629f382686383)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Andre McCurdy [Tue, 18 Feb 2014 08:01:28 +0000 (00:01 -0800)]
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.
(From meta-qt5 rev:
0d9f550f68f27ebbdf8856693b1078bbb3049849)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Jacob Kroon [Sat, 18 Jan 2014 11:09:20 +0000 (12:09 +0100)]
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",
b8a236df79c25802c1f2eb2525e8a534e73e608e)
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.
(From meta-qt5 rev:
dc0073bb4586077ec1cc5204cca9029c656997b4)
Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Andreas Müller [Wed, 5 Feb 2014 19:35:11 +0000 (20:35 +0100)]
qtbase: eglfs: fix egl error for platforms only supporting one window/surface
(From meta-qt5 rev:
52e39c35ee227a9eb1b1a182f9a873c4e7e55825)
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>
Andreas Müller [Mon, 10 Feb 2014 20:45:00 +0000 (21:45 +0100)]
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
(From meta-qt5 rev:
47ec6dbcba57b0b0f7dbeb00bef24f8d85112947)
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>
Martin Jansa [Fri, 7 Feb 2014 03:10:06 +0000 (04:10 +0100)]
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
(From meta-qt5 rev:
4b7182a3be2b591e8190ff15b7a121191e4b201f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Gabe Johnson [Mon, 3 Feb 2014 20:14:14 +0000 (14:14 -0600)]
nativesdk-qtbase, nativesdk-qttools: Fix file search paths
* this is useful for using newer meta-qt5 with older oe-core
release
(From meta-qt5 rev:
79944bda32a7e4799e7e73ea5b0dfc71ff1fc172)
Signed-off-by: Gabe Johnson <gjohnson@agleader.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Tue, 18 Feb 2014 13:04:05 +0000 (10:04 -0300)]
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
(From meta-qt5 rev:
6e71d92786b1560f12c5f0bb06d62ad2d0e601b5)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Mon, 17 Feb 2014 19:58:14 +0000 (16:58 -0300)]
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.
(From meta-qt5 rev:
32cee0b6d18a9e8ae2977accf2c8d32f303827d7)
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>
Otavio Salvador [Mon, 17 Feb 2014 18:01:31 +0000 (15:01 -0300)]
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>
Otavio Salvador [Mon, 17 Feb 2014 14:30:58 +0000 (11:30 -0300)]
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>
Otavio Salvador [Fri, 14 Feb 2014 21:00:40 +0000 (19:00 -0200)]
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>
Otavio Salvador [Fri, 14 Feb 2014 20:58:40 +0000 (18:58 -0200)]
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>
Denys Dmytriyenko [Mon, 10 Feb 2014 21:16:55 +0000 (16:16 -0500)]
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>
Otavio Salvador [Thu, 6 Feb 2014 11:09:01 +0000 (09:09 -0200)]
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>
Otavio Salvador [Fri, 7 Feb 2014 13:38:17 +0000 (11:38 -0200)]
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>
Otavio Salvador [Thu, 6 Feb 2014 01:05:21 +0000 (23:05 -0200)]
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>
Otavio Salvador [Fri, 7 Feb 2014 12:50:59 +0000 (10:50 -0200)]
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>
Andreas Oberritter [Tue, 28 Jan 2014 20:19:01 +0000 (21:19 +0100)]
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>
Martin Jansa [Wed, 29 Jan 2014 15:23:30 +0000 (16:23 +0100)]
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>
Andreas Oberritter [Fri, 24 Jan 2014 00:02:55 +0000 (01:02 +0100)]
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>
Martin Jansa [Sun, 19 Jan 2014 11:09:14 +0000 (12:09 +0100)]
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>
Andreas Müller [Fri, 17 Jan 2014 14:59:18 +0000 (15:59 +0100)]
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>
Martin Jansa [Sun, 12 Jan 2014 13:55:37 +0000 (14:55 +0100)]
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>
Andreas Müller [Tue, 17 Dec 2013 10:44:22 +0000 (11:44 +0100)]
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>
Martin Jansa [Sat, 2 Nov 2013 18:06:14 +0000 (19:06 +0100)]
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>
Martin Jansa [Tue, 31 Dec 2013 11:07:29 +0000 (12:07 +0100)]
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>
André Draszik [Tue, 3 Dec 2013 15:20:55 +0000 (16:20 +0100)]
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>
Martin Jansa [Thu, 12 Dec 2013 13:41:46 +0000 (14:41 +0100)]
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>
Denys Dmytriyenko [Tue, 26 Nov 2013 04:33:44 +0000 (23:33 -0500)]
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>
Denys Dmytriyenko [Tue, 26 Nov 2013 04:33:37 +0000 (23:33 -0500)]
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>
Denys Dmytriyenko [Tue, 26 Nov 2013 01:47:57 +0000 (20:47 -0500)]
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>
Martin Jansa [Fri, 15 Nov 2013 17:52:03 +0000 (18:52 +0100)]
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>
projects / scm / bb / tizen-distro.git / log