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>
* 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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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>
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>
Also add -developer-build to PACKAGECONFIG
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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>
* 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>
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>
* 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>
* 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>
* 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>
- patch 10 was update
- patch 19 & 25 are merged so no more needed
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* full GL is called desktop in qtbase configure
* without this it will try to autodetect and doesn't fail when
e.g. mesa wasn't built before qtbase
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* only for qt 5.1.0; didn't had the time to port this to 5.0.2
* client recipes need to export OE_QMAKE_PATH_EXTERNAL_HOST_BINS in EXTRA_OECMAKE
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* While building a custom rootfs using poky, meta-oe, meta-ti
and meta-qt5 (all on Dylan branch), I got the following error:
[...]
Computing transaction...error: Can't install
qtbase-tools-5.0.2-r2.0@armv7a_vfp_neon: no package provides /usr/bin/perl
[...]
* syncqt is perl script with /usr/bin/perl shebang, that's why rpm
was complaining (other package managers in OE doesn't check that)
Signed-off-by: Christian Gagneraud <chgans@gna.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* some options are tri-state and PACKAGECONFIG doesn't support that
if you need the 3rd option, you need to overwrite PACKAGECONFIG[opt]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Currently fontconfig support is autodetected. It is better to be
deterministic. Since qtbase-fonts is not installed where fontconfig
will find it, it seems that current users are not using fontconfig.
Signed-off-by: Philip Craig <phil@blackmoth.com.au>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The proper 'virtual' name for EGL is virtual/egl, not virtual/libegl,
as per meta/recipes-graphics/mesa/mesa-common.inc.
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
0018 - Offset support for QOpenGLPaintDevice is required for
speedup WebKit hardware rendering.
0019 - Fix FBO restoring in QOpenGLTextureGlyphCache
Jira task
0020 - Uses right texture format to exclude extra convertion.
Signed-off-by: Alexander Irhin <alexander.irhin@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
- fonts were not installed (at least in qt 5.0.2) so install
them manually.
- split the font package in smaller package as done in qt4 to
save space on the target.
- use OE_QMAKE_PATH_LIBS which corresponds with:
mkspecs/features/qpa/genericunixfontdatabase.prf: fonts.path = $$[QT_INSTALL_LIBS]/fonts
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* all patches applied in recipes should be also applied in
https://github.com/meta-qt5/qtbase branches to make it
easier to upgrade to new version without loosing any
patches
* apply:
0013-Disable-mkv8snapshot.patch
0014-enables-tslib-device-to-be-read-from-env-variable.patch
0015-qtbase-allow-build-of-examples.patch
also for git version, only
0016-configure-add-tslib-support.patch
is now 5.0.2 specific (similar patch already applied in stable branch)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
- the tslib support is not enabled by default and configure doesn't have any option
to active it, so add the option to the build system,
- patch tslib support to get the device from the environment variable
(patch taken from https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
- provide variable to enable tslib support in a bbappend (disabled by default)
- tested on an i.MX5x target with qt 5.0.2
TODO : test with 5.0, 5.0.1 and _git
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* drop Change-Ids, add Upstream-Status
* 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was
rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't
used in recipes
* 0004-Disable-mkv8snapshot.patch and
0005-AddSynchoronization-qimagereader.patch are special, because they
are applied only to 5.0.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* endian option was removed from configure
* arch/host-arch option is now deprecated and configure shows
warning when it's used
* both are now autodetected
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* makes it easier to change desktop gl to gles2 in .bbappend
* we cannot explicitly disable opengl with -no-opengl, because then it
fails to build (probably only when mesa headers are found in sysroot)
/qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:62:72: error: 'QPlatformOpenGLContext' has not been declared
/qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp: In constructor 'QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat&, int*, EGLDisplay, EGLenum)':
/qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:69:70: error: invalid static_cast from type 'int*' to type 'QEGLPlatformContext*'
The same with 5.0.2
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* "${B}/*" in quotes doesn't match anything, better to remove whole directory
(incluing .files) and recreate it
* not sure why I've added quotes after testing first version, we don't
expect B with spaces.. but I'm a bit scared with rm -rf ${SOME_VAR}
after one glibc upgrade cleaned my whole disk and attached NFS array
when OLD_LOCALE_PATH wasn't detected correctly...
* qmake works well with separate B, use it by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* all variables should be now correctly set by qmake
* setting PARALLEL_MAKE in MAKEFLAGS can cause
PARALLEL_MAKE * PARALLEL_MAKE processes, because first
-j is applied on top level directory and then again in
each subdir, but it's faster then make -j PARALLEL_MAKE
only in top directory
* setting QMAKE breaks build in src/tools/bootstrap, because it
forces relative path bin/qmake which isn't correct
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Jonathan Liu
Andreas Oberritter
Martin Jansa
Andre McCurdy
Mikko Levonmaa
Andreas Müller
Denys Dmytriyenko
Eric Bénard
Tasslehoff Kjappfot
Simon Busch
Christian Gagneraud
Philip Craig
Nicolas Dechesne
Alexander Irhin
Oleg Shparber
Mikko Levonmaa