summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-native.inc
Commit message (Collapse)AuthorAgeFilesLines
* qtbase/EXTERNAL_HOST_BINS: split out code only required for native-(sdk)Andreas Müller2015-02-181-0/+1
| | | | | | | | | | * code was moved from 0003-Add-external-hostbindir-option.patch to 0014-Add-external-hostbindir-option-native.patch * only native(-sdk) versions of qtbase apply 0014-Add-external-hostbindir-option-native.patch Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: upgrade from 5.3.2 to 5.4.0Jonathan Liu2014-12-111-3/+2
| | | | | | | | MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM MJ: qtwebkit: move leveldb dependency to .inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Jonathan Liu <net147@gmail.com>
* qtbase: Drop dont-process configure optionMartin Jansa2014-10-041-1/+0
| | | | | | | | | | | * it was removed completely in 5.4 with: commit b7d86139772c3ce662ea7f092658699d351bbb1d Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Thu Jun 19 11:46:10 2014 +0200 nuke -process/-fully-process/-dont-process options Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt*: refresh the patchesMartin Jansa2014-10-041-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: restore QOpenGLPaintDevice-sub-area-support.patch from 5.3.0Martin Jansa2014-07-221-0/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: upgrade from 5.3.0 to 5.3.1Martin Jansa2014-07-061-14/+9
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5Martin Jansa2014-06-101-6/+9
| | | | | | * move more patches to "shared" section Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade from 5.2.1 to 5.3.0Jonathan Liu2014-06-101-0/+2
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: explicitly disable icuMartin Jansa2014-02-191-0/+1
| | | | | | | | * Jonathan Liu reported that qtbase-native was failing to build for him and it looks like qtbase-native was trying to link against icu from his host (instead of icu-native because it isn't in DEPENDS) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.2.0Martin Jansa2014-01-121-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop INC_PR and update PR only in 5.0.2 recipesMartin Jansa2013-07-251-2/+0
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patchesMartin Jansa2013-05-281-0/+3
| | | | | | | | | | | | | | | | * 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) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: remove non existing partsEric BENARD2013-05-281-1/+0
| | | | | | | make/nomake demos doesn't exist in qt5. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patches, drop 2 unusedMartin Jansa2013-05-211-9/+11
| | | | | | | | | | | | | * 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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configureMartin Jansa2013-05-091-0/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5: drop QT_DIR_NAME subdirectory from many OE_QMAKE_PATH_* variables ↵Martin Jansa2013-05-091-2/+2
| | | | | | | | | | | | | | | | | 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) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5: Fix cleaning separate build directory and use it by defaultMartin Jansa2013-05-091-9/+0
| | | | | | | | | | | | * "${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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5_base: export OE_QMAKE variables only in qtbase recipesMartin Jansa2013-05-091-0/+11
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctlyMartin Jansa2013-05-091-3/+0
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add patch to fix build with LD exported in envMartin Jansa2013-05-091-0/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: fix install pathsMartin Jansa2013-05-071-0/+15
| | | | | | | | * 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>
* qt5: drop EXTRA_ENVMartin Jansa2013-05-071-3/+0
| | | | | | | | | | | | | * 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>
* qtbase-native: Apply 0001-Always-build-uic.patch for all versionsMartin Jansa2013-05-071-0/+4
| | | | | | | * 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>
* qtbase: Find wayland-scanner correctlyMikko Levonmaa2013-05-051-0/+1
| | | | | | | * Remove silent rules for wayland-scanner Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> Signed-off-by: Martin Jansa <martin.jansa@lge.com>
* qmake5_base: define variables for paths used by qmake in one placeMartin Jansa2013-05-051-7/+8
| | | | | | | | | | | * 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>
* qtbase: remove some dead codeMartin Jansa2013-04-281-1/+0
|
* qt5: move SSTATE_SCAN_FILES to qmake5_base.bbclassMartin Jansa2013-04-281-2/+0
| | | | | * penalty for more replacements is better then to forget to add this in some component which will also install .prl files
* qtbase: Remove QT_DIR_NAME, QT_BASE_NAMEMartin Jansa2013-04-281-1/+0
| | | | | * QT_DIR_NAME is set in qmake5_base * QT_BASE_NAME isn't used
* qtbase: Fix INCDIR/LIBDIR paths in .prl filesMartin Jansa2013-04-281-0/+1
|
* qtbase: add patches to fix wrong libdir/include dirs in pkgconfig and ↵Martin Jansa2013-04-281-0/+3
| | | | | | | | | 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>
* qmake: allow to disable debug outputMartin Jansa2013-04-281-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: Enable debug output from Makefile generationMartin Jansa2013-04-281-2/+2
|
* qmake_base: remove QT_DIR_NAME from libdirMartin Jansa2013-04-281-0/+1
| | | | | | | | | * 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>
* qtbase: improve internal build system to support OE way of building qtMartin Jansa2013-04-261-23/+28
| | | | | | | | | | | | | | | | | | | * 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>
* qt5: unify indentationMartin Jansa2013-04-171-40/+40
| | | | * use 4 spaces everywhere like meta-oe and other layers do now
* qtbase: replace g++.conf and linux.conf with qmake.confMartin Jansa2013-04-171-5/+15
| | | | | | | | | * 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
* qmake: fix MAKEFLAGS when PARALLEL_MAKE has spaceMartin Jansa2013-04-171-1/+1
| | | | | | * 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
* qtbase: use the same patch for qt.conf override for target and nativeMartin Jansa2013-04-171-2/+1
|
* qt5-native, qtjsbackend-native: fix .pri and .prl pointing to WORKDIR or ↵Martin Jansa2013-04-171-10/+21
| | | | | | | | | | | | | | | | | | | | | 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/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-native: rename to qtbase-native to avoid confusionMartin Jansa2013-04-171-0/+63
* 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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>