Commit Graph

159 Commits

Author SHA1 Message Date
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
Martin Jansa 5d2b301bcb qt3d: add .bez and .obj files to PN-qmlplugins
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:32:59 +02:00
Martin Jansa 1f89458946 README: change oe-core URL to github and add -M to send-email
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:03 +02:00
Martin Jansa bd10121a0d 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Ian Reinhart Geiser 370bbaf80e qtdeclarative: Add qtsvg and qtxmlpatterns to depends
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Ian Reinhart Geiser 6bc9ccfa01 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Ian Reinhart Geiser ce3f6c6f87 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Ian Reinhart Geiser 269ce3d01c qtimageformats: Add module
* MJ: simplified to use newer classes
* MJ: Add license information

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Ian Reinhart Geiser 3c0d8a8287 qtmultimedia: Add module
* MJ: simplified to use newer classes
* MJ: Add license information
* MJ: use OE_QMAKE_PATH_QML for packaging definition

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Ian Reinhart Geiser 935d55a076 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Ian Reinhart Geiser 12259a03ec qtsvg: Add module
* MJ: simplified to use newer classes
* MJ: Add license information

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-06 12:22:02 +02:00
Byungseon Shin 49fe70cda9 qtbase: Fix reentrancy problem in image reading
* Fix GF-2779, by applying Upstream patch QTBUG-29281.

Signed-off-by: Byungseon Shin <sun.shin@lge.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 12:21:30 +02:00
Mikko Levonmaa 188ff8fb52 qtbase: Disable mkv8snapshot
* Disabling this for the time being as it generates invalid
  instructions when the target is arm.

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 12:21:30 +02:00
Mikko Levonmaa 37d0412e34 qtgraphicaleffects: Add recipe
* MJ: Add license information
* MJ: Fix PV

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
2013-05-06 12:21:30 +02:00
Mikko Levonmaa fc0b7ec73c 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

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 12:21:28 +02:00
Mikko Levonmaa db7467e72a qtsensors: Add recipe
* MJ: Add license information
* MJ: Fix PV

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 11:45:13 +02:00
Mikko Levonmaa 92d465ece8 qtlocation: Add recipe
* MJ: Add license information
* MJ: Fix PV

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 11:45:13 +02:00
Mikko Levonmaa aadfcfe976 qtquick1: Add recipe
* MJ: Add license information
* MJ: Fix PV

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 11:45:13 +02:00
Mikko Levonmaa 6600c47c66 qt3d: Add recipe
* MJ: Add license information
  not sure which parts (or maybe all) is under LICENSE.PREVIEW.COMMERCIAL
* MJ: Fix PV

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 11:45:08 +02:00
Mikko Levonmaa feca032e52 qtxmlpatterns: Add recipe
* MJ: Add license information
* MJ: Fix PV

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-05 12:56:35 +02:00
Mikko Levonmaa d0c0704464 qtscript: Add recipe
* MJ: Add license information
* MJ: Fix PV

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-05 12:56:35 +02:00
Heikki Paajanen 92881cd8a4 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.

Signed-off-by: Heikki Paajanen <heikki.paajanen@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-05 12:56:35 +02:00
Mikko Levonmaa bbaf26aec2 qtbase: Find wayland-scanner correctly
* Remove silent rules for wayland-scanner

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-05 12:56:34 +02:00
Mikko Levonmaa 92aba5ebaf qt5-git: Provide a way to configure the git repo branch from a module
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-05 12:56:34 +02:00
Martin Jansa d57e27ec08 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-05 12:56:34 +02:00
Martin Jansa cd2ac1d786 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-05 12:56:34 +02:00
Martin Jansa 66c091481c 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-05 12:56:34 +02:00
Martin Jansa 18d2e711d8 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)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-05 12:56:32 +02:00
Martin Jansa d4a726ccf6 qt5module.inc: move shared logic to new .inc file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 15:55:10 +02:00
Martin Jansa 7d3f0711ee qt5: move do_install modifications to shared qt5.inc and reuse do_configure 2013-04-28 15:55:10 +02:00
Martin Jansa 0a88f92505 qtbase: refresh patches and add missing to 5.0.2 and git versions 2013-04-28 15:55:10 +02:00
Martin Jansa 2790c1607e qmake5: drop exports already exported in qmake5_base 2013-04-28 15:55:10 +02:00
Martin Jansa 45c98c921e qt5: use consistent naming for LICENSE 2013-04-28 15:55:10 +02:00