Commit Graph

191 Commits

Author SHA1 Message Date
Florian Haenel e1223d648c qtdeclarative-5.0.2: Add 4 patches for runtime issues
* 3 backports from newer qtdeclarative:
  System Hang while moving App Ribbon
  Fix for segfault in some ListView Cases
  Make use of BGRA texture format to improve image upload time
* 1 pending fix:
  Fix for ViewTransitions not working in horizontal ListViews

Signed-off-by: Florian Haenel <florian.haenel@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-14 12:11:50 +02:00
Janne Kiiski 46626d15cd qtwayland: Add temporary hack to build for Qt 5.0.2
* Append MODULE_VERSION to .qmake.conf if missing.
* resolved in newer revision:
  commit 4d124fea48a0d094443ed0e031c8e28ec04611a3
  Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
  Date:   Tue Feb 26 12:56:57 2013 +0100
  Subject: define MODULE_VERSION

Signed-off-by: Janne Kiiski <janne.kiiski@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-07 17:28:46 +02:00
Alexander Irhin ac8a20d754 qtbase: patches for WebKit hardware accelerated rendering support
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>
2013-06-07 11:43:33 +02:00
Martin Jansa 6f4e86b621 qtbase-5.0.2: backport fix for build with gcc-4.8
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:26 +02:00
Martin Jansa 49319a8617 qtjsbackend: refresh hardfloat patch from stable branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:26 +02:00
Eric BENARD d8ce75b573 qtjsbackend: hardfloat patch is only needed for 5.0.2
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:25 +02:00
Eric BENARD 1fdab229df qtbase: install and split package fonts
- 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>
2013-05-28 18:20:25 +02:00
Martin Jansa 4a82435fff qtbase: Refresh 0016-configure-add-tslib-support.patch from stable branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:25 +02:00
Martin Jansa 34bf6934ea qt3d, qtjsondb, qtlocation, qtsensors, qtsystems: bump SRCREV to latest
* WARN: because these modules weren't released yet, we need to make sure to
  use SRCREV compatible with selected PV for other modules, old revisions
  were compatible with 5.0.[01], I need to test these new SRCREVs to test
  git versions
* tested with 5.0.2 and 5.0.2+git%

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:19:44 +02:00
Martin Jansa 1496c6ba34 qtbase: refresh patches
* 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>
2013-05-28 15:25:53 +02:00
Martin Jansa f8b065ea11 qt5: drop 5.0.0 and 5.0.1 versions
* maintaining 4 different versions requires a lot more testing of
  changes in .inc files and we have only one version of modules without
  release (only one _git.bb) and it's impossible to find SRCREV which
  would be compatible with all 4 versions.
* 0005-AddSynchoronization-qimagereader.patch was already backported to
  5.0.2 in upstream
* 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was
  already applied in 5.0.2

* 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in
  qt5-versions.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 15:25:25 +02:00
Eric BENARD f52b59a5cc qtbase: add option to enable tslib support
- 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>
2013-05-28 10:55:11 +02:00
Eric BENARD 7994fc13da qtdeclarative-5.0.2: fix examples compilation
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:55:07 +02:00
Eric BENARD 712d678c3a qtbase-5.0.2: fix v8 and allow build of examples
- fix v8 segfault (at least on armv7)
- examples are only provided as sources but in our case, binaries
are more interesting for user to test the features on the target.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:38 +02:00
Eric BENARD 440e7829dc qtbase: remove non existing parts
make/nomake demos doesn't exist in qt5.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:32 +02:00
Eric BENARD 7698fc1494 qtbase: add 0004-Disable-mkv8snapshot.patch to 5.0.1
else qml application segfault.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:27 +02:00
Eric BENARD c4fe1b8f55 qtjsbackend: fix hardfloat detection in v8
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:22 +02:00
Eric BENARD 34bed723f3 qt: package examples
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:15 +02:00
Oleg Shparber a991d0c2ac Allow to control (disable) widgets build 2013-05-28 10:40:19 +02:00
Martin Jansa 14f6ec2ca2 qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIG
* full path is part of sstate checksum with immediate expansion

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-24 19:50:00 +02:00
Martin Jansa 35ccafd9c5 qtbase: refresh patches, drop 2 unused
* 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>
2013-05-21 22:22:05 +02:00
Martin Jansa 81b7031859 qtbase: fix qlibrayinfo patch
* returning QSettings even without existing qtconfig was causing,
  e.g. QLibraryInfo::location(QLibraryInfo::PluginsPath) returning
  "`pwd`/plugins" instead of correct "/usr/lib/qt5/plugins"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-21 21:45:11 +02:00
Martin Jansa 26d8de5404 Add COPYING.MIT to be clear about license of this layer
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-10 14:42:07 +02:00
Martin Jansa 459a144d2e README: add meta-ruby dependency needed for qtwebkit 2013-05-10 12:59:47 +02:00
Martin Jansa 4c197c6223 qmake5_base: Define OE_QMAKE_PATH_QT_* variables
* and move it to separate .bbclass which is easier to
  replace in distro layer when you don't care about
  conflicts with qt4

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 21:41:32 +02:00
Martin Jansa 727b27e936 qmake5: move default do_configure and do_install to qmake5.bbclass
* it's useful for many recipes outside qt5 and easy to overwrite when needed
2013-05-09 19:16:32 +02:00
Martin Jansa 34a4b6bc24 qtbase: drop setting arch and endian
* 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>
2013-05-09 19:15:34 +02:00
Martin Jansa 48138bfb27 qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configure
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 16:54:03 +02:00
Simon Busch 94b2064593 qtbase: move virtual/libgl dependency to extra variable
* 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>
2013-05-09 13:56:49 +02:00
Martin Jansa d8314098bf qmake5: drop QT_DIR_NAME subdirectory from many OE_QMAKE_PATH_* variables and add it back in qt5.inc
* we're using QT_DIR_NAME subdirectory mostly to prevent conflicts with existing files from qt4
  but setting it in all OE_QMAKE_PATH_* variables causes all apps which are just using qmake to
  build to install e.g. in /qt5 which for stuff like qterminal or something doesn't
  sound right (as long as there isn't qterminal4 and qterminal5 recipe)

* some variables are kept with default QT_DIR_NAME, e.g. qml, imports, plugins we can assume that
  every application which installs some QML files will install them in location shared by all

* add qt5-native.inc which also adds this QT_DIR_NAME and common
  inherits (later will be used also by qtwayland-native.inc)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 7caede7850 qmake5: Fix cleaning separate build directory and use it by default
* "${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>
2013-05-09 13:56:49 +02:00
Martin Jansa 56d2c7f18d qmake5_base: export OE_QMAKE variables only in qtbase recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 1c29e5de8d qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctly
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa c46260790e qtbase: add patch to fix build with LD exported in env
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 1965248b7b qmake5: use QT_CONF_PATH variable in do_generate_qt_config_file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:55:04 +02:00
Martin Jansa 9773d8eb22 qmake5_base: drop default -e from EXTRA_OEMAKE and add variables we want to override
* exports are still needed at least for qtbase configure script (which
  is using our special eval variant of getQ(X)MakeConf functions
  but maybe we should move them only to qtbase now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:54:57 +02:00
Martin Jansa f40204dc97 qmake5_base: disable debug output by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 17:19:10 +02:00
Martin Jansa 9fc8712009 qtlocation: add qtjsondb instead of qtdeclarative dependency
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 16:09:08 +02:00
Martin Jansa 1e41cca4a6 qtwebkit: add qtlocation and qtsensors dependency
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 16:09:08 +02:00
Martin Jansa d24764db1b qtquick1: add qtsvg, qtxmlpatterns and qtwebkit dependency
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 16:09:05 +02:00
Martin Jansa ee50b5f78a qt3d: add qtdeclarative dependency
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 15:58:19 +02:00
Martin Jansa ae45cb478f qt5module: drop it and include only qt5.inc
* not all modules depend on qtbase, qtbase-native dependency is added
  by qmake5.bbclass:
  QT5TOOLSDEPENDS ?= "qtbase-native "
  DEPENDS_prepend = "${QT5TOOLSDEPENDS}"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 15:57:48 +02:00
Martin Jansa c879989531 qtjsondb, qtwebkit: respect ICU variable 2013-05-07 15:37:49 +02:00
Martin Jansa ed6e2f317f qt5: move variables used only in qtbase to qtbase.inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 15:37:00 +02:00
Martin Jansa 32165f04d4 qtbase-native: fix install paths
* 5.0.2+git was installing uic in wrong directory STAGING_DIR_NATIVE
  was there twice, while debuging this I've noticed that headers and docs
  are installed in this wrong directory also in other versions

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 12:18:45 +02:00
Martin Jansa f76e45b5a8 qt5: drop EXTRA_ENV
* 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>
2013-05-07 12:18:41 +02:00
Martin Jansa 956abd44cc qtbase-native: Apply 0001-Always-build-uic.patch for all versions
* when uic does not exist in QT_EXTERNAL_HOST_BINS it will silently switch to
  /usr/bin/qt5/uic and build will fail a bit later

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 11:01:59 +02:00
Martin Jansa d060f11aa5 qt5-versions: lock more modules
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 11:01:59 +02:00
Martin Jansa 26097532fb qt5-*.inc: let module.inc to define LICENSE
* it was working for LIC_FILES_CHKSUM, but not LICENSE
* we need to change order of includes, first version.inc then module.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 11:01:59 +02:00
Martin Jansa 996f91828c qt5: Add recipes for missing versions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 11:01:55 +02:00