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>
Martin Jansa [Wed, 12 Dec 2012 05:09:18 +0000 (06:09 +0100)]
qtbase: disable xcb
(From meta-qt5 rev:
a03f6cc2bf012d5e43eb27210f8b835a80d50346)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 11 Dec 2012 22:42:35 +0000 (14:42 -0800)]
qtjsbackend: fix native dependency
Also fixes the broken qtjsbackent-native recipe
(From meta-qt5 rev:
bfe100c179c69d3b66cd74c5f3a4aa493cc49b15)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 11 Dec 2012 00:14:51 +0000 (01:14 +0100)]
qtdeclarative: fix typo
(From meta-qt5 rev:
921546e3288330c027154c2b671bf893fff9d293)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 10 Dec 2012 23:37:10 +0000 (00:37 +0100)]
qtjsbackend: fix SRC_URI formatting
(From meta-qt5 rev:
ffc2911bcec031836a1c003dcb1506b765a9bf35)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 10 Dec 2012 23:35:26 +0000 (00:35 +0100)]
qtjsbackend_4.999+git: use common structure and bump SRCREV to latest
(From meta-qt5 rev:
b7cdb5428d2d73f2614227f8a4abebf06f446bae)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 10 Dec 2012 23:31:06 +0000 (00:31 +0100)]
qtdeclarative_4.999+git: use common structure and bump SRCREV to latest
(From meta-qt5 rev:
a52f36a63cd03e5f17e1e2d1a9776870c6f3c1f9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 10 Dec 2012 23:29:23 +0000 (00:29 +0100)]
qtdeclarative: LIC_FILES_CHKSUM should be in source, not COMMON_LICENSE_DIR
(From meta-qt5 rev:
458e15b19ec257b2d4853e90c87ce1581c07637a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 10 Dec 2012 23:24:03 +0000 (00:24 +0100)]
qt5-4.999+git.inc: update PV for SRCREVs after 5.0.0-rc1
(From meta-qt5 rev:
ccb4d199df02ee706d7b5944724fffa434643c8c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 10 Dec 2012 23:23:19 +0000 (00:23 +0100)]
qtbase, qt5-native: upgrade to 5.0.0-rc1
(From meta-qt5 rev:
0879ad08aa48d384576ef5a7b98b3a0dadae19dc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Mon, 10 Dec 2012 23:20:18 +0000 (00:20 +0100)]
qt5-4.999+git.inc: fix PV format
(From meta-qt5 rev:
d6c825767cff12f810324b6b520d45da58b81e4f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 4 Dec 2012 01:25:40 +0000 (02:25 +0100)]
qtbase-4.999+git: bump SRCREV to latest
(From meta-qt5 rev:
436fab1083651affc93c5455c4d60869ad0e8621)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 4 Dec 2012 00:29:51 +0000 (01:29 +0100)]
qt5-native-4.999+git: bump SRCREV to latest
(From meta-qt5 rev:
c460ac223b342b1e90f99e1237ffcef5f2e78474)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Sun, 9 Dec 2012 21:56:34 +0000 (13:56 -0800)]
qtdeclarative: packaging update and recipe cleanup
(From meta-qt5 rev:
9f3d14a2fca85f99f2b7bb881e4be736fe266685)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Sun, 9 Dec 2012 21:53:29 +0000 (13:53 -0800)]
qtjsbackend: SHA bump
Also uses the same qmake.conf as other modules
(From meta-qt5 rev:
14f60829d8e3df70327b51e729fc68f833a5e333)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Sun, 9 Dec 2012 21:48:29 +0000 (13:48 -0800)]
qtbase: fix installations
Created new variables OE_CROSS_INSTALL_DATA and OE_CROSS_HOST_DATA
to support the installation and configuration of qtbase and dependant
modules.
Added paths for Qml2Imports
(From meta-qt5 rev:
bd6c9c28c2aa789a7f906a7ffb5bc2c18cc77884)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Sun, 9 Dec 2012 21:45:11 +0000 (13:45 -0800)]
qt5-native, qtbase: Git version is preferred
Atleast until qt5 is offciall released. Also updated git SHAs
(From meta-qt5 rev:
5dc4d0616a4dd00dfaaafe37317cb606a3e3863d)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Fri, 7 Dec 2012 16:57:03 +0000 (08:57 -0800)]
qtdeclarative: Initial recipe
(From meta-qt5 rev:
16e4143ba5765f96d68cffbbf6a1a06491e71011)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Fri, 7 Dec 2012 16:45:43 +0000 (08:45 -0800)]
qtjsbackend: fixed packaging
(From meta-qt5 rev:
18b6ac18c7c0b0eb27c658be14c6b2c4d5c5bc71)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Tue, 4 Dec 2012 20:06:06 +0000 (12:06 -0800)]
qtjsbackend: Initial recipe
(From meta-qt5 rev:
a45a6a184fcacf3a6ba15f4b38e5988b83f4c30f)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Wed, 5 Dec 2012 21:50:46 +0000 (13:50 -0800)]
Updated QT_CONF_PATH default values in qmake5_base
This allows the subsequent modules to install correctly. Also during
do_configure we stage target specific file into the staging area and
modify some prf files inorder to make the module (qt_lib_<module>.pri)
files install correctly
(From meta-qt5 rev:
b514c5d67a259457383db532151a4bf6f482d158)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Wed, 5 Dec 2012 00:32:32 +0000 (16:32 -0800)]
qtbase: mkspecs are now staged correctly
They are placed under STAGING_DATADIR as they need to be
kept separate from the native side. The reason for doing so
is that some qt modules require native tools and the mkspecs
in STAGING_DATADIR_NATIVE cannot be polluted with the target
mkspecs
There are still some packaging issues
(From meta-qt5 rev:
17d2bf1cdd6a6b23a88a8e07dcb640e8f01115d2)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Tue, 4 Dec 2012 00:25:15 +0000 (01:25 +0100)]
qt5-native: explicitly disable xcb
* otherwise we need for -system-xcb
libxcb-native libxau-native libxdmcp-native xcb-util-wm-native
xcb-util-image-native xcb-util-keysyms-native
or for -qt-xcb
libxcb-native libxau-native libxdmcp-native
and fix underlinking in xcb linking test (QMAKE_LIBS_XCB)
| linking xcb
| /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXau.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link)
| /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXdmcp.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link)
| /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauDisposeAuth'
| /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauGetBestAuthByAddr'
| /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XdmcpWrap'
(From meta-qt5 rev:
93fc33ea280a2fd060dc35b6d60e3d6a65968ccf)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Mon, 3 Dec 2012 16:55:40 +0000 (08:55 -0800)]
Preserve the PARALLEL_MAKE value when compiling
(From meta-qt5 rev:
2dd5038560a0f37eb418d1b868eeddf1d60d1fe0)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Sun, 2 Dec 2012 18:04:53 +0000 (10:04 -0800)]
qtbase: partially resolves module pri installation
The pri files get correctly placed under the work dir, but fail
to stage correctly. Also there are some packaging issues
(From meta-qt5 rev:
ff173560e260798e7ed50b9e6cef3d41e8349609)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Thu, 29 Nov 2012 16:45:54 +0000 (08:45 -0800)]
qt5-native: mkspecs are now installed correctly
(From meta-qt5 rev:
c3e8e8de5931e8aac14f6555237e53b1e32502e9)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Mon, 3 Dec 2012 19:14:35 +0000 (11:14 -0800)]
qtbase: use the correct tools from the native sysroot
(From meta-qt5 rev:
cba28bbc10627e70de53c146271e0d4b0e9324dc)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Mon, 3 Dec 2012 19:11:58 +0000 (11:11 -0800)]
qt5-native: Always compile and install uic
(From meta-qt5 rev:
05d88f867da93cf726806b8271f64f06f5c69569)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Mon, 19 Nov 2012 19:27:34 +0000 (17:27 -0200)]
qt5-native: Allow override of qt.conf path
(From meta-qt5 rev:
ead13659cac1002194c016c2109e9695a53fc2a8)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Mon, 19 Nov 2012 19:25:59 +0000 (17:25 -0200)]
qtbase: Replace patch to allow specification of qt.conf file
This patch has been cleaned to the minimum version and is ready for
sending to upstream. Once it is accepted, a backport of the final
version will be included here.
(From meta-qt5 rev:
bb72ea51a11b04d33ddc58ca4e251e575cac9cbd)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Otavio Salvador [Mon, 19 Nov 2012 12:41:57 +0000 (10:41 -0200)]
qtbase: Drop unused patch for setting qt.conf override support
(From meta-qt5 rev:
5bd1456605d1f876b027baaf178664c784966493)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 18 Nov 2012 17:02:52 +0000 (18:02 +0100)]
qt5: split QT_CONFIG_FLAGS to more separate variables
(From meta-qt5 rev:
95e49bf0f426e1f4bb063fb8fb4166d393333817)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Sun, 18 Nov 2012 17:00:35 +0000 (18:00 +0100)]
qt5-native: add -qt-xcb to EXTRA_OECONF
(From meta-qt5 rev:
edb7f7413e706d0de9d169cd9af6f33a86bd712c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Martin Jansa [Thu, 15 Nov 2012 19:44:00 +0000 (20:44 +0100)]
qtbase: add recipe for 5.0.0-beta2
(From meta-qt5 rev:
870536b3be3c03672060c1954985ba4554871c09)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Thu, 15 Nov 2012 19:38:27 +0000 (20:38 +0100)]
qtbase: add recipe for git version
(From meta-qt5 rev:
13ed17b2baeb253961885c469ba3c97b9ed420e5)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Mikko Levonmaa [Thu, 25 Oct 2012 21:12:21 +0000 (14:12 -0700)]
qt5-native: install mkspecs and our g++.conf + linux.conf
(From meta-qt5 rev:
4ec2e9d2d8184f4da4de86711db34012317f3114)
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
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