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>
Martin Jansa [Tue, 7 May 2013 09:01:28 +0000 (11:01 +0200)]
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
(From meta-qt5 rev:
32165f04d49082773dbf6b78afe5506cba522f76)
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:14:08 +0000 (13:14 +0200)]
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
(From meta-qt5 rev:
f76e45b5a8c59b1b8e4b806d2a2a09e6baf4d4e2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 6 May 2013 10:52:17 +0000 (12:52 +0200)]
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
(From meta-qt5 rev:
956abd44cc676af060f905c9b5c570f65bb983d3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 5 May 2013 18:34:10 +0000 (20:34 +0200)]
qt5-versions: lock more modules
(From meta-qt5 rev:
d060f11aa5acdba61afa69c935c35334c8fea613)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 6 May 2013 08:40:21 +0000 (10:40 +0200)]
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
(From meta-qt5 rev:
26097532fb11d683eda5bb80b27901d6be429d18)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 5 May 2013 18:36:42 +0000 (20:36 +0200)]
qt5: Add recipes for missing versions
(From meta-qt5 rev:
996f91828c5275daa7c0dfa4875214f0f16f84ef)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 6 May 2013 08:21:41 +0000 (10:21 +0200)]
qt3d: add .bez and .obj files to PN-qmlplugins
(From meta-qt5 rev:
5d2b301bcb1637c60503b89cc8530fdd31892cb4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 5 May 2013 12:57:21 +0000 (14:57 +0200)]
README: change oe-core URL to github and add -M to send-email
(From meta-qt5 rev:
1f8945894659ead24fdccad51c33e63da356fb99)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 5 May 2013 12:47:48 +0000 (14:47 +0200)]
qt5: add PN-qmlplugins packages and remove them from modules, use OE_QMAKE_PATH_* variables
* qml and imports go to PN-qmlplugins
* all other plugins go to just PN-plugins
(From meta-qt5 rev:
bd10121a0d226e18640f21ef20f490f7569575fb)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Ian Reinhart Geiser [Fri, 4 Jan 2013 23:35:10 +0000 (18:35 -0500)]
qtdeclarative: Add qtsvg and qtxmlpatterns to depends
(From meta-qt5 rev:
370bbaf80e4b9068c32bbd86b452d4cd2128723e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Ian Reinhart Geiser [Sat, 5 Jan 2013 04:44:39 +0000 (23:44 -0500)]
qtsystems: Add module
* MJ: fix PV
* MJ: simplified to use newer classes
* MJ: Add license information
* MJ: use OE_QMAKE_PATH_QML for packaging definition
(From meta-qt5 rev:
6bc9ccfa0101ec07f8ae8a86a049cd2c6766bd48)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Ian Reinhart Geiser [Sat, 5 Jan 2013 05:26:50 +0000 (00:26 -0500)]
qtjsondb: Add module
* MJ: fix PV
* MJ: simplified to use newer classes
* MJ: Add license information
* MJ: use OE_QMAKE_PATH_QML for packaging definition
(From meta-qt5 rev:
ce3f6c6f87d297490edfe898ab32e0fd87f8615f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Ian Reinhart Geiser [Sat, 5 Jan 2013 02:14:01 +0000 (21:14 -0500)]
qtimageformats: Add module
* MJ: simplified to use newer classes
* MJ: Add license information
(From meta-qt5 rev:
269ce3d01c4241cbff082ad339d42e7cd177b327)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Ian Reinhart Geiser [Sat, 5 Jan 2013 01:33:01 +0000 (20:33 -0500)]
qtmultimedia: Add module
* MJ: simplified to use newer classes
* MJ: Add license information
* MJ: use OE_QMAKE_PATH_QML for packaging definition
(From meta-qt5 rev:
3c0d8a8287b3e9ce8d02a1b808ded19e8aed0781)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Ian Reinhart Geiser [Fri, 4 Jan 2013 23:35:33 +0000 (18:35 -0500)]
qtwebkit: Add module
* MJ: simplified to use newer classes
* MJ: Add license information
* MJ: use OE_QMAKE_PATH_QML for packaging definition
* MJ: add missing sqlite3 dependency
(From meta-qt5 rev:
935d55a0769ec9084ef780ac6f098ff07c57bfac)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Ian Reinhart Geiser [Fri, 4 Jan 2013 23:34:31 +0000 (18:34 -0500)]
qtsvg: Add module
* MJ: simplified to use newer classes
* MJ: Add license information
(From meta-qt5 rev:
12259a03ec15d898878dc8b125cdaa7ef15691b0)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Byungseon Shin [Wed, 17 Apr 2013 00:54:27 +0000 (17:54 -0700)]
qtbase: Fix reentrancy problem in image reading
* Fix GF-2779, by applying Upstream patch QTBUG-29281.
(From meta-qt5 rev:
49fe70cda9cda9d73080751cb97a7719d04db056)
Signed-off-by: Byungseon Shin <sun.shin@lge.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Wed, 9 Jan 2013 22:44:21 +0000 (14:44 -0800)]
qtbase: Disable mkv8snapshot
* Disabling this for the time being as it generates invalid
instructions when the target is arm.
(From meta-qt5 rev:
188ff8fb52527ac338c0223350067948d14eca60)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Wed, 13 Mar 2013 22:11:30 +0000 (15:11 -0700)]
qtgraphicaleffects: Add recipe
* MJ: Add license information
* MJ: Fix PV
(From meta-qt5 rev:
37d0412e343cac16c06eb51bf47b5e72d14f852e)
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Wed, 6 Mar 2013 20:31:29 +0000 (12:31 -0800)]
qtwayland: Add recipe
* Fix shader precision definition
* MJ: Fix license information
* MJ: Fix PV
* MJ: add wayland-native to depends for wayland-scaner
* MJ: add libxkbcommon to depends, but make it easy to remove it
(From meta-qt5 rev:
fc0b7ec73ce6aa470b6666ad115f3d0e8b83a340)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 8 Jan 2013 20:48:24 +0000 (12:48 -0800)]
qtsensors: Add recipe
* MJ: Add license information
* MJ: Fix PV
(From meta-qt5 rev:
db7467e72a8330b0b73546ff3f68e424aeea4b1c)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 8 Jan 2013 20:47:54 +0000 (12:47 -0800)]
qtlocation: Add recipe
* MJ: Add license information
* MJ: Fix PV
(From meta-qt5 rev:
92d465ece830b9d4ed83acc633e31d5efa1b2100)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 8 Jan 2013 19:57:20 +0000 (11:57 -0800)]
qtquick1: Add recipe
* MJ: Add license information
* MJ: Fix PV
(From meta-qt5 rev:
aadfcfe9763bc13799621b4bd70b72e268b33e0c)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 8 Jan 2013 20:01:44 +0000 (12:01 -0800)]
qt3d: Add recipe
* MJ: Add license information
not sure which parts (or maybe all) is under LICENSE.PREVIEW.COMMERCIAL
* MJ: Fix PV
(From meta-qt5 rev:
6600c47c668b597dfdce3675d60db851f3521af3)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 8 Jan 2013 20:01:16 +0000 (12:01 -0800)]
qtxmlpatterns: Add recipe
* MJ: Add license information
* MJ: Fix PV
(From meta-qt5 rev:
feca032e52e61042c8032961673044e0e8f9707c)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 8 Jan 2013 18:04:54 +0000 (10:04 -0800)]
qtscript: Add recipe
* MJ: Add license information
* MJ: Fix PV
(From meta-qt5 rev:
d0c0704464893b193962689b66a9d2d90b163f32)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Heikki Paajanen [Mon, 11 Mar 2013 14:32:31 +0000 (16:32 +0200)]
qtdeclarative: Fix flickable event handling
* With isis2 touch mocking there is a situation where flickable doesn't
process mouse events even if it has mouse grabbed.
* Patch is cherry-picked from upstream.
(From meta-qt5 rev:
92881cd8a426b83153860fde6dd7d17c2958ee82)
Signed-off-by: Heikki Paajanen <heikki.paajanen@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Wed, 6 Mar 2013 20:20:37 +0000 (12:20 -0800)]
qtbase: Find wayland-scanner correctly
* Remove silent rules for wayland-scanner
(From meta-qt5 rev:
bbaf26aec2f2b64c2d061ab4c81773d569d99d4e)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 8 Jan 2013 19:50:37 +0000 (11:50 -0800)]
qt5-git: Provide a way to configure the git repo branch from a module
(From meta-qt5 rev:
92aba5ebafd80830b1ca5b3ff9ad34eea17d47cc)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 29 Apr 2013 09:59:52 +0000 (11:59 +0200)]
qt5: Instead of fixing paths after installation, fix them in Makefile before
* thanks to Mikko Levonmaa
* move it from qt5.inc to qmake5_base.bbclass, because it can be useful
for other apps too
(From meta-qt5 rev:
d57e27ec08164d1c06e7f5169aa0fb23725f78b4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 29 Apr 2013 09:48:11 +0000 (11:48 +0200)]
qt5-git: rename recipes and include file
* some modules weren't released yet, so we still need some recipes with
PV = "4.999+5.0.0-beta1+git${SRCPV}"
so having 5.0.2 in .inc filename is a bit misleading
* .inc file still sets default PV (now "5.0.2+git${SRCPV}"), all modules
where SRCREV corresponds to different versions need to set PV inside
(From meta-qt5 rev:
cd2ac1d786da2be205f8059da9f58f919fa4a24b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 20:44:42 +0000 (22:44 +0200)]
qmake5_base: define variables for paths used by qmake in one place
* makes it easier to change them, should be reused also in FILES_*
variables
* table of path variables and their different names available at
https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE
* all variables have OE_QMAKE_PATH_ prefix and then name from qmake
varaible
(From meta-qt5 rev:
66c091481cb3a8afdeb8422a1a997c5339392ae0)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 20:30:58 +0000 (22:30 +0200)]
qmake5_base: add qmake5_base_do_configure which allows to declare QMAKE_VARSUBST_*
* don't export it, let recipe decide where to call it or even if it
should be called (native recipes are not using it)
(From meta-qt5 rev:
18d2e711d87ffd8c6c341757d5810cef1d05dc39)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 13:19:00 +0000 (15:19 +0200)]
qt5module.inc: move shared logic to new .inc file
(From meta-qt5 rev:
d4a726ccf6e9ab1272555161ae4eb69ea508652b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 13:16:18 +0000 (15:16 +0200)]
qt5: move do_install modifications to shared qt5.inc and reuse do_configure
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 12:15:13 +0000 (14:15 +0200)]
qtbase: refresh patches and add missing to 5.0.2 and git versions
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:38:49 +0000 (13:38 +0200)]
qmake5: drop exports already exported in qmake5_base
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:32:20 +0000 (13:32 +0200)]
qt5: use consistent naming for LICENSE
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:30:26 +0000 (13:30 +0200)]
qtdeclarative: Update LICENSE info
* 5.0.2 and git recipes have the same LICENSE as qtbase (defined in qt5-${PV}.inc)
(From meta-qt5 rev:
a0099515d277936814e5ed687dd5e3f4da552d29)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:25:51 +0000 (13:25 +0200)]
qtjsbackend: Update LICENSE info
(From meta-qt5 rev:
7354b4ffe5662fa321f97f821974eff4dbb29679)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:09:31 +0000 (13:09 +0200)]
qtjsbackend: remove PARALLEL_MAKE setting
* it seems to work fine with modified v8.pro
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:08:27 +0000 (13:08 +0200)]
qtbase: remove some dead code
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:08:11 +0000 (13:08 +0200)]
qt5: allow to change -release/-debug for some modules
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:03:59 +0000 (13:03 +0200)]
qt5: move SSTATE_SCAN_FILES to qmake5_base.bbclass
* penalty for more replacements is better then to forget to add this
in some component which will also install .prl files
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 11:00:53 +0000 (13:00 +0200)]
qtbase: Remove QT_DIR_NAME, QT_BASE_NAME
* QT_DIR_NAME is set in qmake5_base
* QT_BASE_NAME isn't used
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 10:58:41 +0000 (12:58 +0200)]
qtbase: Fix INCDIR/LIBDIR paths in .prl files
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 01:01:25 +0000 (03:01 +0200)]
qtdeclarative: Fix installation and packaging
* now it's also prefixed with sysroot like in qtbase
(From meta-qt5 rev:
e88c6945308a05366228a0946cb086bc6359c5eb)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:54:48 +0000 (02:54 +0200)]
qtjsbackend: Fix installation, now it's also prefixed with sysroot
* like in qtbase
(From meta-qt5 rev:
ca4c4eea5f28c85d1ba490c1f4bfbc605de8b205)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:45:50 +0000 (02:45 +0200)]
qtjsbackend: Use better patch to respect external-host-bindir
* mkv8snapshot isn't in default PATH when it's in ${bindir}/${QT_DIR_NAME}
(From meta-qt5 rev:
c2c53514ad8e29b6fbd171119d8e1ec72a8f1946)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:24:17 +0000 (02:24 +0200)]
qtbase: Override all paths and export sysroot
* otherwise sysroot from native build can leak to target build
* missing paths like Qml2Imports were defaulting to devault /usr/qml
* synchronize values between qt.conf and configure params
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:21:55 +0000 (02:21 +0200)]
qtbase: add patches to fix wrong libdir/include dirs in pkgconfig and libtool files
* qt_module.prf replacements were creating -L/usr/lib in .pc files which is bad for cross-compilation
* also use '=' for sysroot in libtool files
(From meta-qt5 rev:
b3abb65f6af9e6a48410f53d69444ffb026b39bb)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:19:12 +0000 (02:19 +0200)]
qtjsbackend: add .pri and .prl to SSTATE_SCAN_FILES
(From meta-qt5 rev:
92705869f74b6e20ef006a2b9c79fbcdc9ff4a5b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:16:27 +0000 (02:16 +0200)]
qt5: package files with and without QT_DIR_NAME prefix
* makes it easier to modify paths without QA warnings about unpackaged files
(From meta-qt5 rev:
d2d5b7804e5e2c5895439faf22fb378329261830)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:14:16 +0000 (02:14 +0200)]
qtjsbackend-native: Use separate build directory
(From meta-qt5 rev:
38de259db85f43008db4bd2133791ee81f29a01c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 28 Apr 2013 00:13:28 +0000 (02:13 +0200)]
qmake: allow to disable debug output
(From meta-qt5 rev:
09516373c0940b60c797a922b3b3206b82e01182)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 26 Apr 2013 20:17:07 +0000 (22:17 +0200)]
qtbase-native: Enable debug output from Makefile generation
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 26 Apr 2013 18:54:26 +0000 (20:54 +0200)]
qmake_base: remove QT_DIR_NAME from libdir
* using ${libdir}/${QT_DIR_NAME} is causing pkgconfig files to be
installed in this prefix too
* modify ArchData variable to move mkspecs files to qt5 prefix (so that
they don't conflict with qt4)
(From meta-qt5 rev:
e89e33fd173fc4006218e99ed363ca292d0a9644)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 25 Apr 2013 22:21:25 +0000 (00:21 +0200)]
5.0.2+git: bump SRCREVs a bit more
* it's close to 5.1.0
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 22 Apr 2013 23:02:11 +0000 (01:02 +0200)]
qtdeclarative: Fix SEPB build, remove module_qmake.conf
(From meta-qt5 rev:
ea8d37c17dda7d9aa2e1a825b0bef492204bbb0f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 22 Apr 2013 22:58:55 +0000 (00:58 +0200)]
qtjsbackend: Fix SEPB build and work around wrong mkspec install path
(From meta-qt5 rev:
9fddbb70bdc71c5aa7feb93e62fa9da45e1230cc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 22 Apr 2013 22:56:47 +0000 (00:56 +0200)]
qt5: Add mkspecs package and update FILES to package ${QT_DIR_NAME} directories
(From meta-qt5 rev:
a86304a384189115e79351c5c86d192f679ee9cd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 22 Apr 2013 22:55:13 +0000 (00:55 +0200)]
qtbase5_base: move binaries and libs to QT_DIR_NAME
* mkspecs are now installed to libdir/${QT_DIR_NAME}
* use the same qt.conf for all qtbase5_base, only qtbase-native is different now
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 17 Apr 2013 21:13:20 +0000 (23:13 +0200)]
qtbase: temporary disable target qmake build and add PN-mkspecs
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 17 Apr 2013 21:12:50 +0000 (23:12 +0200)]
qmake5_base: add Plugins settings
* otherwise plugins are installed in /lib/plugins
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 17 Apr 2013 19:59:04 +0000 (21:59 +0200)]
qmake5_base: don't push AR to EXTRA_ENV
* it overwrites value set from shell env in qmake.conf and ar is loosing cqs params
mkspecs/linux-oe-g++/qmake.conf:QMAKE_AR = $(OE_QMAKE_AR) cqs
(From meta-qt5 rev:
40436b7fc9f0d699071191ca06ea70b1f2ee82e4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 11:26:26 +0000 (13:26 +0200)]
qt5-versions.inc: add include file to select PREFERRED_VERSIONs of qt5 components
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 11:08:50 +0000 (13:08 +0200)]
qt5-git: bump revision in git recipes to latest stable branch
* there are important fixes in qtbase bootstrapping
* create also own directory for patches, easier for many versions to coexist for now
(From meta-qt5 rev:
6fb40c8d03266f647dfd71c50b18fb3086e47392)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 16:10:40 +0000 (18:10 +0200)]
qt5: add 5.0.2
* patch files are kept in separate dir, because I expect that 5.0.1
will have to live a bit longer for e.g. webkit-qt developers to adapt
(From meta-qt5 rev:
42ab168449bda4610a9c02b7560b56682316c63e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 17 Apr 2013 13:31:24 +0000 (15:31 +0200)]
qt5: restore 5.0.0 recipes
* there are some issues with 5.0.1 and qt-webkit, keep 5.0.0 available
until everybody is ready to upgrade to 5.0.2 or newer
(From meta-qt5 rev:
239e292d020c6494fbd6101888f8bed139572598)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 12:13:27 +0000 (14:13 +0200)]
qtbase: improve internal build system to support OE way of building qt
* add linux-oe-g++ mkspec directly with patch
* add functions to read and eval OE_QMAKE functions from mkspec and
also export them with QMakeVar to be available also for config.tests
* add external-host-bindir parameter to skip building native tools
even when we're in fact cross-compiling (because we have them from
qtbase-native build already).
* use separated ${B} and ${S} and clean ${B} when reconfiguring
stalled qmake cache can be used when configure is reexecuted
cleaning ${B} prevents that and provide cleaner separation
* OE_QMAKE_AR cqs is added by Makefile, having it here too was causing
issues
* isEmpty(QT_EXTERNAL_HOST_BINS) doesn't work, so lets use exist()
even when it allows to incorrectly set wrong directory and build
native tools again (instead of skipping them)
(From meta-qt5 rev:
fe65aed3393cf32efe6158c615e72aea407a4bc6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 17 Apr 2013 14:33:22 +0000 (16:33 +0200)]
qt5: unify indentation
* use 4 spaces everywhere like meta-oe and other layers do now
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 17 Apr 2013 14:40:27 +0000 (16:40 +0200)]
qt5-5.0.1: use QT_VERSION_DIR, just for consistence"
(From meta-qt5 rev:
1e5520a64f0c78f238b0399ac6cbfb3510eeb530)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Fri, 5 Apr 2013 17:50:23 +0000 (19:50 +0200)]
qtbase: add udev to DEPENDS
* it's autodetected, causing undeterministic builds
(From meta-qt5 rev:
e16556b8c7c937d810dd9234a62e2ab03521ed11)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 20:03:04 +0000 (22:03 +0200)]
qmake5_base: drop unused exports
UIC/MOC/RCC are no longer defined in generated Makefiles
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 18:18:50 +0000 (20:18 +0200)]
qtbase: disable gdb_dwarf_index
* qmake is trying to call native gdb and we don't depend on gdb-native
(or even provide gdb-native)
* fixes errors like this:
/bin/sh: gdb: command not found
/bin/sh: line 0: test: -gt: unary operator expected
which are not fatal, but still misleading in do_configure output
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 19:52:54 +0000 (21:52 +0200)]
qtbase: replace g++.conf and linux.conf with qmake.conf
* g++.conf and linux.conf were outdated a lot, lacking new options like
QMAKE_COMPILER causing a lot of warning like:
Project WARNING: qmake spec does not announce the compiler family. Guessed gcc.
* Instead of replacing whole common files, use custom qmake.conf which
overwrites common setting after including it
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 19:06:13 +0000 (21:06 +0200)]
qtbase: drop qmake.conf.sh and qplatformdefs
* defaults in linux-g++ are correct, we need only to modify common
linux.conf and g++-unix.conf
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sat, 30 Mar 2013 03:04:20 +0000 (04:04 +0100)]
qtbase: correctly configure
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 27 Dec 2012 15:40:13 +0000 (16:40 +0100)]
qtbase: don't touch STAGING and bypass sstate
(From meta-qt5 rev:
2b5c531b22703025e67b2f207db91ea178f7ead5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 15:18:53 +0000 (17:18 +0200)]
qtbase: add patch to eval QMAKE_CXX
* fixes errors in log.do_configure trying to call wrong CXX
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 14:51:02 +0000 (16:51 +0200)]
qmake5_base: define both QMAKESPEC and let recipe select which one to use
* different platform/xplatform can enable cross-compile build in upstream qmake
but that's not the same as what recipes are doing (upstream builds native tools
when bootstraping target qtbase, recipes build native tools with separate
qtbase-native and then want to skip building tools)
* still separate variables for both QMAKESPECs can be useful e.g. for
other native recipes
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 14:47:26 +0000 (16:47 +0200)]
qmake: fix MAKEFLAGS when PARALLEL_MAKE has space
* quotes are needed, because some people have '-j 9' instead of '-j9'
* this can in theory cause PARALLEL_MAKE x PARALLEL_MAKE threads, because
MAKE itself is using PARALLEL_MAKE threads to run inner makes
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 3 Apr 2013 14:42:45 +0000 (16:42 +0200)]
qtbase: use the same patch for qt.conf override for target and native
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 27 Feb 2013 20:26:09 +0000 (21:26 +0100)]
qt5-native, qtjsbackend-native: fix .pri and .prl pointing to WORKDIR or absolute sysroot
* fix paralel build
* default make does good job, cleans mkspecs, installs all headers and
libs needed for qtjsbackend-native
* move native tools to QT_DIR_NAME prefix, this way qt4 and qt5 can be
staged at the same time
* only variables referencing WORKDIR are now QMAKE_PRL_BUILD_DIR
./x86_64-linux/usr/lib/libQt5Network.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/network/
./x86_64-linux/usr/lib/libQt5Xml.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/xml/
./x86_64-linux/usr/lib/libQt5Bootstrap.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/tools/bootstrap/
./x86_64-linux/usr/lib/libQt5Concurrent.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/concurrent/
./x86_64-linux/usr/lib/libQt5Core.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/corelib/
./x86_64-linux/usr/lib/libQt5Test.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/testlib/
./x86_64-linux/usr/lib/libQt5Sql.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/sql/
./x86_64-linux/usr/lib/libQt5DBus.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/dbus/
(From meta-qt5 rev:
70b1b233b20c4128cd068c35244c1a97934edf1d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 28 Feb 2013 19:56:51 +0000 (20:56 +0100)]
qt5-native: rename to qtbase-native to avoid confusion
* we also had PROVIDES for qt5-tools-native, this makes it a bit easier to see what is what
* drop FILESEXTRAPATHS, not needed after renaming to match BPN with qtbase patches
(From meta-qt5 rev:
5d5ba83cc6eadbff6d60d5ae4947bc9b48d846f4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Eric Blade [Sun, 17 Feb 2013 08:59:58 +0000 (09:59 +0100)]
qt5: upgrade to 5.0.1
(From meta-qt5 rev:
a376cc61ed00eccd0892936d101a1ecece0e6f3c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 18 Dec 2012 20:14:40 +0000 (12:14 -0800)]
qt5-native: Getting rid of printf statements in qmake
They will cause the building of cmake-native to fail as it
will parse the output of qmake -query and is not expecting
to find the added lines in the output
(From meta-qt5 rev:
a812c654dbf9df088ab9a06a890e49d39bd7d6a6)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 27 Dec 2012 15:43:59 +0000 (16:43 +0100)]
qt5: move module specific files to own directories
(From meta-qt5 rev:
9f04cb7bb6f9753e32988127038b648afbd9b974)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 27 Dec 2012 15:40:13 +0000 (16:40 +0100)]
qt5: remove unused qmake-build.conf.sh
(From meta-qt5 rev:
319a61802d4d5fb971693f3df1e69450e7bbab8a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 19 Dec 2012 18:15:51 +0000 (19:15 +0100)]
qt5: upgrade recipes to use 5.0.0 tarballs
* and change DEFAULT_PREFERRENCE for git recipes negative again
* bump SRCREV in git recipes to latest and update PV
(From meta-qt5 rev:
597f9bf624f81dd63358158fe656b8d7984cab07)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 19 Dec 2012 16:53:14 +0000 (17:53 +0100)]
qtbase: don't touch STAGING_DATADIR
(From meta-qt5 rev:
1ecc46ac42a685057c94e1bd30147ea81ab925bf)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 17 Dec 2012 19:33:02 +0000 (20:33 +0100)]
qtbase, qtdeclarative: bump SRCREV to latest
(From meta-qt5 rev:
6a07d6efce4c14960c592e92e20200b335ad1fa4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Sat, 15 Dec 2012 00:46:41 +0000 (16:46 -0800)]
qmake5: library path correction in generated qt.conf
(From meta-qt5 rev:
34d4955894fae96d56e0b3831cd295b399230df2)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Sat, 15 Dec 2012 00:39:59 +0000 (16:39 -0800)]
qtbase: fix up prl and pkgconfig file generation
(From meta-qt5 rev:
b93420ad8f6383fc93648cfdf59bafc3e4a6a9a5)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 12 Dec 2012 18:11:06 +0000 (19:11 +0100)]
qt5: fixup FILES_ entries
* some are not needed as they are included in default value
(From meta-qt5 rev:
6b7dd87f920794cbe11e657bb6a053bd24763372)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 12 Dec 2012 17:39:01 +0000 (18:39 +0100)]
qt5: use lastest SRCREV in stable branches
* master branches were removed today and old SRCREVs are invalid now
(From meta-qt5 rev:
7b3138f3690f626faa179cbe1597c0e1cf649a36)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 12 Dec 2012 05:30:04 +0000 (06:30 +0100)]
qtjsbackend: use common qt5.inc
(From meta-qt5 rev:
20091a9f08c82d101ae730d682c402f80a97a4fc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 12 Dec 2012 05:29:34 +0000 (06:29 +0100)]
qtdeclarative: use common qt5.inc, fix invalid PACKAGES
(From meta-qt5 rev:
0ff97f9e6a959216c164d728cad7962a2a2909e2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Wed, 12 Dec 2012 05:19:48 +0000 (06:19 +0100)]
qt5: move qtbase specific stuff from qt5.inc to qtbase.inc
* qt5.inc should be used by all qtmodule.inc
* add missing PACKAGES in qt5.inc
(From meta-qt5 rev:
97f4709e4c5e3facea506cde3c98a4175c01be63)
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