Eric Bénard [Mon, 7 Oct 2013 20:57:17 +0000 (22:57 +0200)]
qtdeclarative: update to 5.1.1
(From meta-qt5 rev:
976d9af04725f156d2dd8b4e0277d4ef1789d008)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric Bénard [Mon, 7 Oct 2013 20:56:50 +0000 (22:56 +0200)]
qtxmlpatterns: update to 5.1.1
(From meta-qt5 rev:
56eb7fdac93ece1efd720c17af48e59d1bf9c6e9)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric Bénard [Mon, 7 Oct 2013 20:56:33 +0000 (22:56 +0200)]
qtsvg: update to 5.1.1
(From meta-qt5 rev:
d90d6ed18e0b9b5d3ecff4315945004dcf4224d8)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric Bénard [Mon, 7 Oct 2013 20:56:10 +0000 (22:56 +0200)]
qtjsbackend: update to 5.1.1
(From meta-qt5 rev:
f40e53b1cbd8ce798490116a0484fccdb888a206)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric Bénard [Mon, 7 Oct 2013 20:54:12 +0000 (22:54 +0200)]
qtbase: update to 5.1.1
- patch 10 was update
- patch 19 & 25 are merged so no more needed
(From meta-qt5 rev:
105ad2a18e20f2b07d20a1640917e69950c8496b)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric Bénard [Sun, 6 Oct 2013 18:49:06 +0000 (20:49 +0200)]
cinematicexperience: add example
for more informations on this demo :
http://kgronholm.blogspot.fr/2012/08/qt5-cinematic-experience.html
http://quitcoding.com/?page=work#cinex
(From meta-qt5 rev:
149e6b6d3730a1ff5431cdfedd2c6dbc623362b9)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 4 Oct 2013 17:40:46 +0000 (19:40 +0200)]
README: Add note about qtbase PACKAGECONFIG options
(From meta-qt5 rev:
d43d777816cf7270e99bfdebd7660e7a07145895)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 4 Oct 2013 14:52:17 +0000 (16:52 +0200)]
qtwebkit: Export RUBYLIB to fix wrong paths hardcoded in native ruby
* when ruby-native is reused from sstate it can contain paths pointing
to wrong sysroot
(From meta-qt5 rev:
d6fc754ac4145b0edf0d4bb62af1018d67ad1b64)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Stefan Schmidt [Sat, 28 Sep 2013 22:25:14 +0000 (22:25 +0000)]
maliit: Import maliit recipes from meta-oe
* Imported from rev
13ae5105ee30410136beeae66ec41ee4a8a2e2b0
This is the first step to move these recipes over to qt5.
* maliit-framework-qt5: Build with qt5
Switch to new github repo
Update SRCREV and remove patches which now longer apply
Disable doc generation and xcb
Fix packaging
* maliit-plugins-qt5: Build with qt5.
Switch to new github repo
Update SRCREV and PV
Fix packaging
* maliit-*-qt5: Adjust MKSPEC path
* meta-framework-qt5: Cleanup packaging and enable dbus activation.
Move pkgconfig files, headers and spec files into dev.
Cleanup packaging rules
Enable dbus activation to start maliit server on demand
* maliit-plugins-qt5: Set MALIIT_PLUGINS_DATA_DIR to avoid path leakage from host
If not overriden here MALIIT_PLUGINS_DATA_DIR would point to some host
paths resulting in e.g. qml files not being found.
(From meta-qt5 rev:
d691c447784646688b3b0445d63359a7d9292926)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Trevor Woerner [Fri, 20 Sep 2013 03:16:06 +0000 (03:16 +0000)]
devshell: include PATH for qt5 native applications
If you perform a "bitbake -c devshell <some qt5 recipe>" and then try "which
qmake" in the devshell, you'll find your host's qmake is found (which is most
likely to be based on qt4) rather than the one that is built as part of
meta-qt5. The reason for this is that the qt5 items are installed to
${STAGING_DIR_NATIVE}/usr/bin/qt5 and not ${STAGING_DIR_NATIVE}/usr/bin. The
reason for the extra "qt5" directory at the end is so that qt4-based items
that are built in OE can live side-by-side with things from meta-qt5 without
interfering with each other.
This patch prepends ${STAGING_DIR_NATIVE}/usr/bin/qt5 to the devshell's PATH
so that the qt5-based native tools which are built as part of meta-qt5 will be
found before the host's.
(From meta-qt5 rev:
f4188229f100349f4c88340b62a37d3ebfe51cc5)
Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Trevor Woerner [Tue, 24 Sep 2013 02:35:11 +0000 (02:35 +0000)]
qtwebkit: fix QA issue (bad RPATH)
Building qtwebkit causes a QA issue such that QtWebPluginProcess and
QtWebProcess contain bad RPATHs which point into the build location. This fix
adds a patch to not include the rpath.prf which causes this problem.
(From meta-qt5 rev:
918d5d9671130580bd7f31cc5b69f7be127063ae)
Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Tasslehoff Kjappfot [Thu, 29 Aug 2013 07:53:44 +0000 (09:53 +0200)]
qtquickcontrols: Add module for 5.1.0 and git versions
(From meta-qt5 rev:
f11b1722e28800c790609d0de9541f6555e1ee5a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Laszlo Papp [Fri, 23 Aug 2013 09:16:05 +0000 (09:16 +0000)]
QtSerialPort: Add 5.1.0 version
(From meta-qt5 rev:
f770c5dca9d755ebda51deb1f578f1ec43c68d8b)
Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 3 Aug 2013 13:27:50 +0000 (15:27 +0200)]
recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe
* this will make maintaining meta-qt5 a bit easier
(From meta-qt5 rev:
c67873216bb476935a753c3597ba91d8029f307b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 5 Sep 2013 13:16:37 +0000 (15:16 +0200)]
cmake: disable test for Qt5Core
| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message):
| The imported target "Qt5::Core" references the file
|
| "/qmake"
|
| but this file does not exist. Possible reasons include:
|
| * The file was deleted, renamed, or moved to another location.
|
| * An install or uninstall procedure did not complete successfully.
|
| * The installation package was faulty and contained
|
| "tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"
|
| but not all the files it references.
|
| Call Stack (most recent call first):
| tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists)
| tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:130 (include)
| Tests/RunCMake/CMakeLists.txt:80 (find_package)
(From meta-qt5 rev:
671313d0b5e09e0b49a90ed944cd33fb3d6457b0)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Bhooshan Supe [Sat, 27 Jul 2013 02:59:09 +0000 (19:59 -0700)]
qttools-native: Add module to build lrelease+lupdate+lconvert
:Release Notes:
Add optional Qt-Tools module.
:Detailed Notes:
Qt provide optional Qt-Tools like "lrelease", etc.
In absence of these tools one can not have i18n and l10n changes automated in build.
Adding "qttools-native" to "meta-qt5" Open Embedded layer provides those tools.
Using Qt-Tools i18n and l10n changes can be auomated.
:Testing Performed:
:QA Notes:
:Issues Addressed:
[GF-11028] Enable build of Qt localization tools in the Qt component
Change-Id: Ieb679249a05501a6ccb25108903a0fd48d4014f0
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 29 Aug 2013 17:03:59 +0000 (19:03 +0200)]
qtwebkit: remove examples packages
* fixes:
NOTE: multiple providers are available for runtime qtwebkit-examples (qtwebkit-examples, qtwebkit)
NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples
NOTE: multiple providers are available for runtime qtwebkit-examples-dev (qtwebkit, qtwebkit-examples)
NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples-dev
(From meta-qt5 rev:
284020d9344b6fbd88d9c6d5ff6fbaef430a775b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Abhijit Potnis [Tue, 20 Aug 2013 12:49:14 +0000 (18:19 +0530)]
qtwebkit-examples: Add module
(From meta-qt5 rev:
2868f1a1838ab6a893fd01a05e61d582640a056d)
Signed-off-by: Abhijit Potnis <abhijit_potnis@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Simon Busch [Wed, 21 Aug 2013 23:27:16 +0000 (01:27 +0200)]
qtbase: upgrade patches for proper cmake support of native binaries at build time
(From meta-qt5 rev:
7c3a1a208df46fcf094b957cdd35f06729c53eda)
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 [Mon, 19 Aug 2013 06:31:10 +0000 (08:31 +0200)]
qt5-5.1.0: Drop negative D_P
(From meta-qt5 rev:
84c2a25417d9ddc0814f2ac34b6568051e54938e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Marek Belisko [Thu, 15 Aug 2013 19:18:36 +0000 (19:18 +0000)]
Fix download url for qt5-5.0.2.
(From meta-qt5 rev:
2d61422b837acd382e52f78f7ff357b8aca9c3db)
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 13 Aug 2013 20:57:10 +0000 (22:57 +0200)]
qtbase: be more specific in opengl switch with gl in PACKAGECONFIG
* 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
(From meta-qt5 rev:
c3632023e11deb9e7a862f67ad631576e73a3add)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 15 Aug 2013 10:26:49 +0000 (12:26 +0200)]
Revert "qtserialport: Add module"
* incorrect LIC_FILES_CHKSUMS
This reverts commit
5b19e4bd6f48cb67438306ac7bc34a524e8bec19.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Erik Botö [Tue, 13 Aug 2013 06:47:07 +0000 (06:47 +0000)]
qt5-5.0.2.inc: update path to sources
They moved the 5.0.2 sources into an archive dir upstream, this updates
the SRC_URI accordingly.
(From meta-qt5 rev:
3529eb8055a25811b522348643d41a39104089d5)
Signed-off-by: Erik Botö <erik.boto@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Jonathan Liu [Sat, 3 Aug 2013 08:46:10 +0000 (08:46 +0000)]
qtbase: add upstream QTBUG-32534 patch for QHttpMultiPart corruption
(From meta-qt5 rev:
886e8ee5bdb4c95f2e6c1c203f76bc176329454b)
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 [Sat, 3 Aug 2013 13:23:43 +0000 (15:23 +0200)]
qt5-versions: Change default version to 5.1.0
(From meta-qt5 rev:
0f7b2334268b99d3a4ea43bde735b4566f905044)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Laszlo Papp [Sat, 3 Aug 2013 10:38:47 +0000 (10:38 +0000)]
qtserialport: Add module
(From meta-qt5 rev:
5b19e4bd6f48cb67438306ac7bc34a524e8bec19)
Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Simon Busch [Sat, 10 Aug 2013 09:17:13 +0000 (09:17 +0000)]
qtwayland: build and package examples applications too
(From meta-qt5 rev:
d68d26ba4e539929f3949943fa6e4d5c5340afeb)
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>
Simon Busch [Fri, 2 Aug 2013 09:06:06 +0000 (09:06 +0000)]
classes: cmake_qt5: export all qt5 related paths to cmake
(From meta-qt5 rev:
ee6c2abf6a6679582e28f72301f1a538ef98bf95)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Simon Busch [Fri, 26 Jul 2013 08:19:55 +0000 (08:19 +0000)]
qtbase: fix cmake patches to point to correct host binary directory
(From meta-qt5 rev:
4450a42aba024e8af7632074011da074479aac71)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Simon Busch [Mon, 22 Jul 2013 21:20:58 +0000 (21:20 +0000)]
classes: add new cmake_qt5 class
A cmake specific qt5 class which sets all required configuration parameters to
successfully compile cmake based applications.
(From meta-qt5 rev:
6b39eda7a60597a25b9dbed823fe7f2fa8db5659)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Simon Busch [Mon, 22 Jul 2013 21:11:56 +0000 (21:11 +0000)]
qtbase: fix cmake files to use our host binaries
* 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
(From meta-qt5 rev:
243e05f1de42d372abfecab721f8c40eee08548e)
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>
Simon Busch [Mon, 22 Jul 2013 21:14:57 +0000 (21:14 +0000)]
classes: qmake5: move QT_DIR_NAME to qmake5_paths
* qmake5_paths.bbclass refers to QT_DIR_NAME but it's defined on a higher level which
doesn't makes sense and breaks some use cases
(From meta-qt5 rev:
b0100c1b5704e0216733a35ff42afab3c350bef4)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 25 Jul 2013 15:45:16 +0000 (17:45 +0200)]
qtwayland: demote 5.1.0+git version a bit
* 5.0.2+git should stay default for people without qt5-versions.inc
* make sure that % isn't appended twice in qt5-versions.inc
(From meta-qt5 rev:
bb4c8adeeb3107074fbf63bddf292059b370afa5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Christian Gagneraud [Wed, 24 Jul 2013 21:31:47 +0000 (21:31 +0000)]
qtbase.inc: Fix qtbase-tools runtime depencency on perl
* 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)
(From meta-qt5 rev:
07301a163688682b5b3e5dddada6da63593917b0)
Signed-off-by: Christian Gagneraud <chgans@gna.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 22 Jul 2013 12:55:26 +0000 (14:55 +0200)]
qtmultimedia: add gst-plugins-base dependency and openal PACKAGECONFIG
* this will need small patch in qtmultimedia.pro to run
qtCompileTest(openal) only with OE_OPENAL_ENABLED
(From meta-qt5 rev:
43872948d4bb764c723d122cac8dcc0cb1ed93c6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 22 Jul 2013 13:15:53 +0000 (15:15 +0200)]
qtwebkit: add dependency on gstreamer and libxslt
* it's autodetected from sysroot, make it deterministic
* maybe I should allow to change gst-0.10 to 1.0 without
rewriting DEPENDS
(From meta-qt5 rev:
a4c346ba8f66cf06e92b3624d9487bccc19c1358)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 22 Jul 2013 12:49:14 +0000 (14:49 +0200)]
qtimageformats: add dependency on tiff
* it's autodetected from sysroot
(From meta-qt5 rev:
2649027bd09473f2cbe7048fc75712fe448e2f29)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 20 Jul 2013 14:20:29 +0000 (16:20 +0200)]
qt5: drop INC_PR and update PR only in 5.0.2 recipes
(From meta-qt5 rev:
567a4d462fa0129751600d32d07ee67a9c0c3f23)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 20 Jul 2013 12:42:03 +0000 (14:42 +0200)]
qt3d, qtjsondb: bump SRCREV and set MODULE_VERSION
* drop INC_PR/PR where possible
(From meta-qt5 rev:
3da4d425d06f74dbb0b5334f1f62efa20bd02176)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 20 Jul 2013 12:39:37 +0000 (14:39 +0200)]
qtwayland: add second recipe with latest SRCREV, compatible with qt5 5.1.0
(From meta-qt5 rev:
5eb22ffbfafc558a66943e666c415a9749a39e2b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 20 Jul 2013 13:13:32 +0000 (15:13 +0200)]
qt5: bump SRCREVs in git recipes to 5.1.0+
* patches will now be closer to 5.1.0 release
(From meta-qt5 rev:
507c7466ea3a7b10a72b57ce06c3bf1ddd769037)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Jul 2013 14:14:44 +0000 (16:14 +0200)]
qt5: add recipes for 5.1.0
* only rebased patches and updated SRC_URI checksum, haven't even build
tested it yet
(From meta-qt5 rev:
902f55b957ba0407816739bfcae864c6bd2c3d68)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 20 Jul 2013 16:12:24 +0000 (18:12 +0200)]
qmake5_base: add override for HostLibraries
* qtdeclarative was using /usr/lib as HostLibraries causing
WARNING: QA Issue: qtdeclarative: The compile log indicates that host include and/or library paths were used.
Please check the log 'qtdeclarative/5.1.0-r0/temp/log.do_compile' for more information.
DEBUG 1: /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/qt5/mkspecs/features/qt_config.prf:23: QT_MODULE_HOST_LIB_BASE := /usr/lib
* also without this fix qtdeclarative and qtwayland are trying to
build tools against /usr/lib/libQt5Bootstrap.a (without sysroot
prefix)
(From meta-qt5 rev:
ca4a0758e17c69905df6eda86fe678a4f10f50f7)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 28 May 2013 16:20:03 +0000 (18:20 +0200)]
qtwayland: add native recipe
* qtwayland fails, because we'll need to add qtwayland-native to provide
qtwaylandscanner in QT_EXTERNAL_HOST_BINS location (otherwise build
will try to use /usr/bin/qt5/qtwaylandscanner)
* native recipe is needed to build qtwayland-scanner which
is required after this upstream commit
commit
05d054ad7207764293525661876ebc689940a15c
Author: Samuel R<C3><B8>dal <samuel.rodal@digia.com>
Date: Tue Apr 9 16:52:59 2013 +0200
Introduced qtwaylandscanner.
(From meta-qt5 rev:
ebd60ffe7e34f653532e30bfe1fad611a2b31384)
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 [Sat, 20 Jul 2013 13:38:37 +0000 (15:38 +0200)]
qtjsbackend: refresh patches, move to subdirectory
(From meta-qt5 rev:
71cc38affe7b282fdea6f35c9876632056ef22ec)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 19 Jul 2013 22:02:57 +0000 (00:02 +0200)]
qtbase: explicitly enable or disable all deps
* some options are tri-state and PACKAGECONFIG doesn't support that
if you need the 3rd option, you need to overwrite PACKAGECONFIG[opt]
(From meta-qt5 rev:
ebdd83f6b7e5c3296e5ebd3b7b0c1e0defe5aba5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 19 Jul 2013 21:28:48 +0000 (23:28 +0200)]
qtbase-5.0.2: refresh patches to apply cleanly
(From meta-qt5 rev:
b9fec03db878745066f91f354f82ec9c0002f34a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Sat, 6 Jul 2013 20:30:59 +0000 (20:30 +0000)]
qtbase-native-5.0.2: fix compilation on Fedora 19
the patch 0017-Rename-qAbs-Function-for-timeval.patch is also
needed for native else, on Fedora 19, we get :
| ../../include/QtCore/../../../qtbase-opensource-src-5.0.2/src/corelib/global/qglobal.h:483:27: error: from previous declaration 'constexpr T qAbs(const T&) [with T = timeval]'
| Q_DECL_CONSTEXPR inline T qAbs(const T &t) { return t >= 0 ? t : -t; }
(From meta-qt5 rev:
75291e7614115dc89045fcf6650bbdead071da03)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Jul 2013 15:37:27 +0000 (17:37 +0200)]
qmake5: Add trailing space in DEPENDS_prepend instead of QT5TOOLSDEPENDS
* this way it looks better in bitbake -e, instead of:
${QT5TOOLSDEPENDS}${BASEDEPENDS}
(From meta-qt5 rev:
b9b00aaad487fdf4a50d9e69af71742f714f6120)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Jul 2013 14:42:59 +0000 (16:42 +0200)]
qtwayland: Add xproto dependency together with libxkbcommon
* xproto provides X11/keysym.h which is used when testing libxkbcommon support:
executing config test xkbcommon
+ cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && /OE/sysroots/x86_64-linux/usr/bin/qt5/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon
+ cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && make MAKEFLAGS='-j 9' OE_QMAKE_COMPILER='i586-oe-linux-gcc -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_CC='i586-oe-linux-gcc -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_CXX='i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_CFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types' OE_QMAKE_CXXFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden' OE_QMAKE_LINK='i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_LDFLAGS='-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed' OE_QMAKE_AR='i586-oe-linux-ar' OE_QMAKE_STRIP='echo' OE_QMAKE_WAYLAND_SCANNER='/OE/sysroots/x86_64-linux/usr/bin/wayland-scanner'
compiling /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp
/OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp:42:24: fatal error: X11/keysym.h: No such file or directory
compilation terminated.
make: *** [.obj/release-shared/main.o] Error 1
test xkbcommon FAILED
(From meta-qt5 rev:
886509518d5662e42b1177c88403ebb31454c605)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 26 Jun 2013 10:30:43 +0000 (12:30 +0200)]
qtwebkit: Disable debug info by default
(From meta-qt5 rev:
28753fa6aacd27ea3d7f429a44ff88fe26168249)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Philip Craig [Wed, 26 Jun 2013 02:13:02 +0000 (02:13 +0000)]
qtbase: disable fontconfig support by default
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.
(From meta-qt5 rev:
1b14686657cddcc5bb37a5c7db8a35f1c4903ee3)
Signed-off-by: Philip Craig <phil@blackmoth.com.au>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Nicolas Dechesne [Thu, 20 Jun 2013 03:54:42 +0000 (03:54 +0000)]
qtbase: typo about virtual/egl depends
The proper 'virtual' name for EGL is virtual/egl, not virtual/libegl,
as per meta/recipes-graphics/mesa/mesa-common.inc.
(From meta-qt5 rev:
11ebf35b16cf4be024d63526862663599738541d)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 14 Jun 2013 10:24:20 +0000 (12:24 +0200)]
qtdeclarative-git: Add 2 patches from 5.0.2
* 0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch is
applied in newer SRCREV
* 0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch is still
pending
(From meta-qt5 rev:
e02b1ca3c2d8525d5fb3321774136978eab465c9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 14 Jun 2013 08:32:10 +0000 (10:32 +0200)]
qtdeclarative: move 5.0.2 specific patches to own directory
(From meta-qt5 rev:
da60ee1856a65ddcc349c5b42ae88d29e31c1e94)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Florian Haenel [Fri, 7 Jun 2013 22:49:24 +0000 (00:49 +0200)]
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
(From meta-qt5 rev:
e1223d648c15aed72398b5f992d40ae03487bb32)
Signed-off-by: Florian Haenel <florian.haenel@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Janne Kiiski [Thu, 6 Jun 2013 14:40:40 +0000 (17:40 +0300)]
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
(From meta-qt5 rev:
46626d15cde20c665f99c2564f01d3cd95cc0831)
Signed-off-by: Janne Kiiski <janne.kiiski@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Alexander Irhin [Fri, 24 May 2013 18:37:02 +0000 (11:37 -0700)]
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.
(From meta-qt5 rev:
ac8a20d754f122b8238c145ccc346cdbae1158d0)
Signed-off-by: Alexander Irhin <alexander.irhin@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 28 May 2013 14:55:22 +0000 (16:55 +0200)]
qtbase-5.0.2: backport fix for build with gcc-4.8
(From meta-qt5 rev:
6f4e86b62121c94b36e89b8bd7de50099733547f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 28 May 2013 13:36:00 +0000 (15:36 +0200)]
qtjsbackend: refresh hardfloat patch from stable branch
(From meta-qt5 rev:
49319a861790ca35d2f9c8add5a5742b243f5d3d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Tue, 28 May 2013 13:24:42 +0000 (13:24 +0000)]
qtjsbackend: hardfloat patch is only needed for 5.0.2
(From meta-qt5 rev:
d8ce75b573a187dd2dbea51f5ff4ae6ee778b7b9)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Tue, 28 May 2013 13:03:54 +0000 (13:03 +0000)]
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
(From meta-qt5 rev:
1fdab229df6000eb52ac721a3ff4cdd218a0c308)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 28 May 2013 11:02:25 +0000 (13:02 +0200)]
qtbase: Refresh 0016-configure-add-tslib-support.patch from stable branch
(From meta-qt5 rev:
4a82435fff932711146b5c36342556fb8af7003c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 6 May 2013 09:56:34 +0000 (11:56 +0200)]
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%
(From meta-qt5 rev:
34bf6934ea3a51e6ed9cd71616501c9d1f5e52ee)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 28 May 2013 10:47:20 +0000 (12:47 +0200)]
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)
(From meta-qt5 rev:
1496c6ba34bf95bce67504c72edace1bc2c0a64e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 28 May 2013 09:48:09 +0000 (11:48 +0200)]
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
(From meta-qt5 rev:
f8b065ea1174dd1fa7d93359f6826bfc9d23174c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Mon, 27 May 2013 23:43:53 +0000 (23:43 +0000)]
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
(From meta-qt5 rev:
f52b59a5cc9ddfb0ede39194e284c858bfd0cbd8)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Mon, 27 May 2013 23:43:51 +0000 (23:43 +0000)]
qtdeclarative-5.0.2: fix examples compilation
(From meta-qt5 rev:
7994fc13da2971376621e9d8653f89e1d9323eaa)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Mon, 27 May 2013 23:43:50 +0000 (23:43 +0000)]
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.
(From meta-qt5 rev:
712d678c3accc499af0f1fc4d0d55359787b6009)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Mon, 27 May 2013 23:43:49 +0000 (23:43 +0000)]
qtbase: remove non existing parts
make/nomake demos doesn't exist in qt5.
(From meta-qt5 rev:
440e7829dccd48ef249a7314ebee00d4e3a584c5)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Mon, 27 May 2013 23:43:48 +0000 (23:43 +0000)]
qtbase: add 0004-Disable-mkv8snapshot.patch to 5.0.1
else qml application segfault.
(From meta-qt5 rev:
7698fc1494a1bdf04cee20f7206bf2879a718646)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Mon, 27 May 2013 23:43:47 +0000 (23:43 +0000)]
qtjsbackend: fix hardfloat detection in v8
(From meta-qt5 rev:
c4fe1b8f553ebf7e8081cbfa34c970c903284708)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric BENARD [Mon, 27 May 2013 23:43:46 +0000 (23:43 +0000)]
qt: package examples
(From meta-qt5 rev:
34bed723f37fdbb938f31dd25391e2a495ad6d5d)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Oleg Shparber [Sat, 25 May 2013 00:49:39 +0000 (18:49 -0600)]
Allow to control (disable) widgets build
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 24 May 2013 17:50:00 +0000 (19:50 +0200)]
qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIG
* full path is part of sstate checksum with immediate expansion
(From meta-qt5 rev:
14f6ec2ca227c474a9045b68bcf6a6dd78b8cd57)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 21 May 2013 20:16:06 +0000 (22:16 +0200)]
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
(From meta-qt5 rev:
35ccafd9c533c423aa7985ec2ce7f0512283c154)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 21 May 2013 19:44:31 +0000 (21:44 +0200)]
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"
(From meta-qt5 rev:
81b7031859176f24c028c7234d795812bd1a3c95)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 10 May 2013 12:41:57 +0000 (14:41 +0200)]
Add COPYING.MIT to be clear about license of this layer
(From meta-qt5 rev:
26d8de54047979dee8289c077467ee8b4f4934af)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 10 May 2013 10:59:47 +0000 (12:59 +0200)]
README: add meta-ruby dependency needed for qtwebkit
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 9 May 2013 19:17:01 +0000 (21:17 +0200)]
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
(From meta-qt5 rev:
4c197c6223a1c878dfa8c0277a91021c68091a93)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 9 May 2013 17:16:32 +0000 (19:16 +0200)]
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
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 9 May 2013 17:14:15 +0000 (19:14 +0200)]
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
(From meta-qt5 rev:
34a4b6bc246e8c6ce4e39a12ea7bde3e1a76d1d6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 9 May 2013 08:11:02 +0000 (10:11 +0200)]
qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configure
(From meta-qt5 rev:
48138bfb2735e0e07065397d3c93516d202c3104)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Simon Busch [Wed, 8 May 2013 17:51:18 +0000 (19:51 +0200)]
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
(From meta-qt5 rev:
94b2064593e565ceaefdd7ef32506a99b0e6792b)
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, 8 May 2013 20:56:59 +0000 (22:56 +0200)]
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)
(From meta-qt5 rev:
d8314098bf945b4db15302d47eae1d6fc2df882c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 8 May 2013 20:40:30 +0000 (22:40 +0200)]
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
(From meta-qt5 rev:
7caede7850d7b33011a5a0e3124180db2f7a0d6c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 8 May 2013 20:20:41 +0000 (22:20 +0200)]
qmake5_base: export OE_QMAKE variables only in qtbase recipes
(From meta-qt5 rev:
56d2c7f18d5058a168df01d6a4797514a0f958b6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 6 May 2013 11:10:39 +0000 (13:10 +0200)]
qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctly
(From meta-qt5 rev:
1c29e5de8d402eb4a9d57c6104a33798f5004f68)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 8 May 2013 21:58:07 +0000 (23:58 +0200)]
qtbase: add patch to fix build with LD exported in env
(From meta-qt5 rev:
c46260790ea5465cd2b371ac09b2b24912ae0cf3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 8 May 2013 20:13:07 +0000 (22:13 +0200)]
qmake5: use QT_CONF_PATH variable in do_generate_qt_config_file
(From meta-qt5 rev:
1965248b7ba440e27c5c8e30f35ce8cf4afc7987)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 8 May 2013 20:09:46 +0000 (22:09 +0200)]
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
(From meta-qt5 rev:
9773d8eb228275751bb2585d823e8df956356b14)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 15:19:07 +0000 (17:19 +0200)]
qmake5_base: disable debug output by default
(From meta-qt5 rev:
f40204dc97a1b228fa13e7e061b361f5aec7c0b1)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 13:56:12 +0000 (15:56 +0200)]
qtlocation: add qtjsondb instead of qtdeclarative dependency
(From meta-qt5 rev:
9fc87120092d1a7752f077add412d80e3e3b3503)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 12:39:37 +0000 (14:39 +0200)]
qtwebkit: add qtlocation and qtsensors dependency
(From meta-qt5 rev:
1e41cca4a602b12ccbfbfc46e318c448088e925b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 12:20:06 +0000 (14:20 +0200)]
qtquick1: add qtsvg, qtxmlpatterns and qtwebkit dependency
(From meta-qt5 rev:
d24764db1b2c15a19fea9218ceef2c6e782d54ab)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 12:19:19 +0000 (14:19 +0200)]
qt3d: add qtdeclarative dependency
(From meta-qt5 rev:
ee50b5f78aff0abb60084cba978f3f2f499dbba9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 13:30:56 +0000 (15:30 +0200)]
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}"
(From meta-qt5 rev:
ae45cb478fbfacc7e2e23eb365c1f740ad325335)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 13:37:49 +0000 (15:37 +0200)]
qtjsondb, qtwebkit: respect ICU variable
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 7 May 2013 13:10:31 +0000 (15:10 +0200)]
qt5: move variables used only in qtbase to qtbase.inc
(From meta-qt5 rev:
ed6e2f317fd0839f51d03aee4120b25a1e1d704c)
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