Commit Graph

124 Commits

Author SHA1 Message Date
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
Martin Jansa a0099515d2 qtdeclarative: Update LICENSE info
* 5.0.2 and git recipes have the same LICENSE as qtbase (defined in qt5-${PV}.inc)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 15:55:10 +02:00
Martin Jansa 7354b4ffe5 qtjsbackend: Update LICENSE info
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 15:55:10 +02:00
Martin Jansa 4d0f51ce9a qtjsbackend: remove PARALLEL_MAKE setting
* it seems to work fine with modified v8.pro
2013-04-28 15:55:10 +02:00
Martin Jansa 54a6379be4 qtbase: remove some dead code 2013-04-28 15:55:09 +02:00
Martin Jansa 3a91c4dc3d qt5: allow to change -release/-debug for some modules 2013-04-28 15:55:09 +02:00
Martin Jansa eed206da36 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
2013-04-28 15:55:09 +02:00
Martin Jansa 40cf086347 qtbase: Remove QT_DIR_NAME, QT_BASE_NAME
* QT_DIR_NAME is set in qmake5_base
* QT_BASE_NAME isn't used
2013-04-28 15:55:09 +02:00
Martin Jansa 783c979664 qtbase: Fix INCDIR/LIBDIR paths in .prl files 2013-04-28 15:55:09 +02:00
Martin Jansa e88c694530 qtdeclarative: Fix installation and packaging
* now it's also prefixed with sysroot like in qtbase

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 15:55:09 +02:00
Martin Jansa ca4c4eea5f qtjsbackend: Fix installation, now it's also prefixed with sysroot
* like in qtbase

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 15:55:09 +02:00
Martin Jansa c2c53514ad qtjsbackend: Use better patch to respect external-host-bindir
* mkv8snapshot isn't in default PATH when it's in ${bindir}/${QT_DIR_NAME}

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 15:55:09 +02:00
Martin Jansa a5783e1a09 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
2013-04-28 15:55:05 +02:00
Martin Jansa b3abb65f6a 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 92705869f7 qtjsbackend: add .pri and .prl to SSTATE_SCAN_FILES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa d2d5b7804e qt5: package files with and without QT_DIR_NAME prefix
* makes it easier to modify paths without QA warnings about unpackaged files

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 38de259db8 qtjsbackend-native: Use separate build directory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 09516373c0 qmake: allow to disable debug output
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa af9d25bbe7 qtbase-native: Enable debug output from Makefile generation 2013-04-28 13:39:57 +02:00
Martin Jansa e89e33fd17 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)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 9b97567e9c 5.0.2+git: bump SRCREVs a bit more
* it's close to 5.1.0
2013-04-28 13:39:33 +02:00
Martin Jansa ea8d37c17d qtdeclarative: Fix SEPB build, remove module_qmake.conf
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:33 +02:00
Martin Jansa 9fddbb70bd qtjsbackend: Fix SEPB build and work around wrong mkspec install path
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:33 +02:00
Martin Jansa a86304a384 qt5: Add mkspecs package and update FILES to package ${QT_DIR_NAME} directories
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:33 +02:00
Martin Jansa 06ae6e8c9e 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
2013-04-28 13:39:33 +02:00
Martin Jansa 812c33e0c6 qtbase: temporary disable target qmake build and add PN-mkspecs 2013-04-28 13:39:32 +02:00
Martin Jansa def240608a qmake5_base: add Plugins settings
* otherwise plugins are installed in /lib/plugins
2013-04-28 13:39:32 +02:00
Martin Jansa 40436b7fc9 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:32 +02:00
Martin Jansa 861b62f51e qt5-versions.inc: add include file to select PREFERRED_VERSIONs of qt5 components 2013-04-28 13:39:28 +02:00
Martin Jansa 6fb40c8d03 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:05:07 +02:00
Martin Jansa 42ab168449 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:05:07 +02:00
Martin Jansa 239e292d02 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:05:07 +02:00
Martin Jansa fe65aed339 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)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:04:56 +02:00
Martin Jansa 97738e9d62 qt5: unify indentation
* use 4 spaces everywhere like meta-oe and other layers do now
2013-04-17 16:49:18 +02:00
Martin Jansa 1e5520a64f qt5-5.0.1: use QT_VERSION_DIR, just for consistence"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:49:02 +02:00
Martin Jansa e16556b8c7 qtbase: add udev to DEPENDS
* it's autodetected, causing undeterministic builds

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:18:37 +02:00