aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
Commit message (Collapse)AuthorAgeFilesLines
...
* qtbase: remove renameat2 PACKAGECONFIGAndreas Müller2018-08-221-2/+0
| | | | | | | * since glibc 2.28 it is not necessary that Qt implements it * reduce PACKAGECONFIG mania a bit Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* qtbase: fix build with glibc-2.28 - for non-readers like meAndreas Müller2018-08-221-0/+2
| | | | | | | | | | | | 539e4f09f749f024d6e157a49559e5ad7f51470a fixed bootstrapped build. At least cross builds are not done bootstrapped. Fix them too by copying statx/renameat2 macros - non-bootsrapped conditional - to qfilesystemengine_unix.cpp - it is fortunately the only source using QT_FEATURE_renameat2 / QT_FEATURE_statx (or QT_CONFIG(renameat2) / QT_CONFIG(statx)). Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* qtbase: update the dependency for gbm PACKAGECONFIGMartin Jansa2018-08-141-1/+1
| | | | | | | * mesa* conditionally provides virtual/libgbm when gbm is enabled there so it's better than depending on just virtual/mesa Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix build with glibc-2.28Martin Jansa2018-08-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/git/src/corelib/io/qfilesystemengine_unix.cpp:94: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' struct statx_timestamp { ^~~~~~~~~~~~~~~ qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp' struct statx_timestamp ^~~~~~~~~~~~~~~ You might encounter another error: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/git/src/corelib/io/qfilesystemengine_unix.cpp:109:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive] static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags) ^~~~~~~~~ qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/stdio.h:164:12: note: previous declaration of 'int renameat2(int, const char*, int, const char*, unsigned int)' extern int renameat2 (int __oldfd, const char *__old, int __newfd, ^~~~~~~~~ In that case enable renameat2 in your PACKAGECONFIG. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Add a kde PACKAGECONFIGAlistair Francis2018-07-101-0/+2
| | | | | | | | If trying to build KDE there are extra package config options required. This patch adds a KDE DISTRO_CONFIG that enables the extra PACKAGECONFIG options required. Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
* qt5: add option to build Qt5 staticallySamuli Piippo2018-07-041-0/+2
| | | | | | | | | | | | | | | | Add PACKAGECONFIG that enables static build for qtbase and consequently to all Qt recipes. This can be enabled with DISTRO_FEATURE 'qt5-static', which also adds qtdeclarative-native dependency to all recipes that depend on qtdeclarative as it's required for qmlimportscannertool. Building examples and tests with static build can take excessive amounts of time and disk space, so disabling DISTRO_FEATURE 'ptest' and PACKAGECONFIGs 'examples' from qtbase is advised. Not all recipes support static builds and those are not fixed here. Change-Id: Ia0e2a2467cd42d4395ed5292a645fd1d89ad521a Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
* qtbase: add PACKAGECONFIG for Link Time OptimizationSamuli Piippo2018-07-031-1/+2
| | | | | | | | qtbase configure option -ltcg enables Link Time Code Generation using GCC's LTO feature. Enable it by default if the selected optimization is for size. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: remove all references to qtquick1 import pathSamuli Piippo2018-07-031-1/+0
| | | | | | | Since qtquick1 recipes have been removed, there is no need to have OE_QMAKE_PATH_IMPORTS anymore. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: qtbase: Upgrade Double-ConversionAlistair Francis2018-06-251-1/+2
| | | | | | | | | Backport the Double-Conversion upgrade from the dev branch (https://codereview.qt-project.org/#/c/227718/) to the current release. This fixes the RISC-V compile of QTBase. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.11.1Martin Jansa2018-06-221-2/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Add packageconfigs for renameat2 and getentropy useKhem Raj2018-06-131-0/+4
| | | | | | | | | These features depend on underlying syscall support in kernel and if older kernels are in use, then we can have a knob to turn them off. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refresh the patches and update them on meta-qt5 repositoriesMartin Jansa2018-06-051-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: Update to Qt 5.11.0Samuli Piippo2018-05-301-2/+5
| | | | | | Add recipes for Qt OPC UA and Qt WebGL platform plugin. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.11 beta3+Martin Jansa2018-04-201-7/+4
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.11 AlphaMartin Jansa2018-04-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | * use qtwebkit and qtwebkit-examples from dev branch, because there is no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in qt5-git.inc nobody noticed). * qtbase: drop qml-debug options removed from qtbase in: commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1 Author: Ulf Hermann <ulf.hermann@qt.io> Date: Fri Oct 6 16:27:09 2017 +0200 Subject: Remove qml-debug configure flag and feature * qtgraphicaleffects, qtquickcontrols2, qtquickcontrols, qtvirtualkeyboard: add qtdeclarative-native dependency needed for qmlcachegen binary * qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs referenced files disappered in: commit 6882a04fb36642862b11efe514251d32070c3d65 Author: Konstantin Tokarev <annulen@yandex.ru> Date: Thu Aug 25 19:20:41 2016 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: use mysql_config from correct pathSamuli Piippo2018-04-201-1/+1
| | | | | | | | | mysql_config from host sysroot is found first which gives wrong paths for cross-compilation. Use it from crosscompile path instead. Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refresh patches from meta-qt5/qt* reposMartin Jansa2018-02-261-2/+2
| | | | | | | | | | | * apply: 0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch also for nativesdk-qtbase as the comment says * drop unused: 0001-Add-missing-include-for-struct-timeval.patch which wasn't removed in 5.10.1 upgrade Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Replace -isystem with -IKhem Raj2018-02-261-0/+1
| | | | | | | Fixes no-x11 builds (eglfs) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add a config option to optimize for sizeKwangsub Kim2018-02-261-1/+4
| | | | | | | | | | | | The '-optimize-size' option would enable the compiler to optimize for size instead of speed. If the global compiler option already included '-Os', this option would be enabled by default. It would affect the whole Qt libraries and Qt applications as well. This feature is available in Qt 5.9+. Signed-off-by: Kwangsub Kim <kwangsub.kim@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.10.1Mikko Gronoff2018-02-221-1/+1
| | | | | | | | | Updated Qt modules to 5.10.1. New recipe qtknx added. Change-Id: I711c75253a9c0d9dcfbaac8867b35a4505d101ea Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refactor ptestSamuli Piippo2018-02-221-14/+1
| | | | | | | | | | | Current implementation was causing build issues as it cluttered source directories and modified recipe sysroot content. Tests are now build in the separate build directory ${B} where we don't need to worry about moving files to the recipe sysroot, and if tests are enabled in PACKAGECONFIG, they have been already built during do_compile task. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix pcre PACKAGECONFIGStefan Müller-Klieser2018-01-161-1/+1
| | | | | | | | | | Qt switched to pcre2 for 5.9. The configure switch has not been renamed. We just need to update the build dependency. This requires the poky commit: 0204af2 libpcre2: add packages for 16-bit and 32-bit code unit support Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: refresh remaining patches and tags in meta-qt5 reposMartin Jansa2018-01-161-5/+5
| | | | | | | | | * update tag name to match the patches in meta-qt5 repository where the meta-qt5 .patch files are maintained, so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix a regressionMing Liu2018-01-151-0/+5
| | | | | | | | | | | | | | | | A flaw was introduced by commit b8a236df: [ qt5: Fix cmake config files ] Removing ${S}/include must be done before configure script being called, but it's not in that case for qtbase-native recipe after the commit, that is saying, ${S}/include was removed after configure being called, which causes compiling issues for native build. Further more, the logic introduced by commit b8a236df should only apply to qtbase recipes, so they should be moved to qtbase recipes as well. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: introduce QT_EDITIONMing Liu2018-01-151-1/+1
| | | | | | | | QT_EDITION defaults to 'opensource', but the end users could override it with 'commercial' if they want. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase_git: install qt.conf for the targetJeroen Hofstee2017-12-201-0/+2
| | | | | | | | | | | | | The build-in qmake settings point to the sysroots on the host machine. Running qmake on the target hence errors with: Could not find qmake configuration file linux-oe-g++. Error processing project file So add qt.conf to the target image with the correct locations. Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: mkspecs: add default toolchain optionsJeroen Hofstee2017-12-201-0/+22
| | | | | | | | | | | | | | | | | | | | | While most mkspecs use hardcoded compiler names / options, qmake in meta-qt5 is setup to get them from the environment. While this works fine with openembedded, it does break normal workflows outside of it. For example to get the SDK working with Qt Creator either the environmental script most be sourced first, making it impossible to switch between different Qt versions or the OE_QMAKE must be set for every project, otherwise you get cryptic errors like 'make: c: Command not found', since the compiler name is not set and hence an attempt is made to execute only the arguments. Likewise on the target itself, qmake doesn't work without first setting the OE_QMAKE variables. This patch adds default toolchains options, so it is no longer required to set them, but keeps the flexibility to alter them from the environment. Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: use correct HostPrefixSamuli Piippo2017-12-201-1/+1
| | | | | | | | | | Different HostPrefix was used when building Qt and in external SDK's qt.conf. This caused e.g., wrong path in qmodule.pri for PKG_CONFIG_EXECUTABLE. Task-number: QTBUG-63097 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.10.0Samuli Piippo2017-12-161-5/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta-qt5: Update to 5.9.2 releaseHerman van Hazendonk2017-10-171-1/+1
| | | | Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
* qtbase: Fix build with musl/clangKhem Raj2017-09-051-0/+2
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Add OE clang specific mkspecsKhem Raj2017-09-051-1/+5
| | | | | | | | | | | | | We can not piggy back clang anymore on existing OE mkspecs since starting 5.9 the configure is asking compiler for include paths and it needs to know if platform is clang-linux or g++-linux Fixes: ERROR: failed to parse default search paths from compiler output Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: upgrade to latest revision in 5.9 branchMartin Jansa2017-08-221-2/+2
| | | | | | * 3 patches were included upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: refresh remaining patches and add links to meta-qt5 reposMartin Jansa2017-08-201-0/+2
| | | | | | | | | | | | | | | | | | | * remove qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch which is already applied and fuzzy patch just apply the same section twice * restore qttools/0001-add-noqtwebkit-configuration.patch which was removed from SRC_URI in 5.9 upgrade * add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.9.0Samuli Piippo2017-08-201-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | * adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects and QtWebView as a new Qt modules * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently * QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64) * refresh the patches to match with b5.9* branches on: https://github.com/meta-qt5/qtbase https://github.com/meta-qt5/qtwebengine and 56-based branch on https://github.com/meta-qt5/qtwebengine-chromium Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: ↵Martin Jansa2017-08-201-1/+24
| | | | | | disable gold to work around binutils bug Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix Krogoth build regression from efa8aafMatt Hoosier2017-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With commit efa8aaf82e580a7d32eaaab48eb92d436f2e222a Author: Andreas Müller <schnitzeltony@googlemail.com> Date: Thu Feb 9 00:26:09 2017 qmake5_base.bbclass: set qt.conf by environment variable again we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist. The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file. The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change: commit 2afcbfef2cd1ca568e5225884a8021df38ee3db0 Author: Ross Burton <ross.burton@intel.com> Date: 2016-07-14 13:56:22 bitbake: build: don't use $B as the default cwd for functions The result is that when we build with Krogoth or prior, the body of do_generate_qt_config_file() runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too. do_configure() -- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf. This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of do_generate_qt_config_file(). (cherry picked from commit a17ff281aa8d99f770b0a049cb798235005fb93e at https://codereview.qt-project.org/yocto/meta-qt5.) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh the patchesMartin Jansa2017-08-171-6/+6
| | | | | | | | | | | | * upload the patches to b5.8* branches on: https://github.com/meta-qt5/qtbase * refresh the patches * notice that some patches were in section which is meant to be common for target, native and nativesdk qtbase but were added only in target recipe, I've updated them to be included in all 3, hopefully they can be used in all 3 (I don't use nativesdk at all) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: remove qtbase-native from DEPENDSMing Liu2017-08-131-2/+0
| | | | | | | | qtbase-native has been included by QT5TOOLSDEPENDS, so this line is redundant and leading multiple qtbase-native existing in DEPENDS. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Use sched_yield instead of pthread_yieldKhem Raj2017-08-081-0/+1
| | | | | | | Makes it portable across glibc and musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix ptests with clangKhem Raj2017-08-081-0/+1
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add ptestHuang Qiyu2017-08-081-1/+16
| | | | | | | Add ptest for qtbase by using provided testsuite. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: respect "ld-is-gold" DISTRO_FEATURESDenys Dmytriyenko2017-06-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If not set explicitly, some modules like QtWebKit and QtQuick1 can fail: | make[2]: Entering directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | rm -f libQt5WebKit.so.5.8.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.8 | linking ../lib/libQt5WebKit.so.5.8.0 | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_end' | collect2: error: ld returned 1 exit status | Makefile.api:92: recipe for target '../lib/libQt5WebKit.so.5.8.0' failed | make[2]: *** [../lib/libQt5WebKit.so.5.8.0] Error 1 | make[2]: Leaving directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | Makefile.QtWebKit:44: recipe for target 'sub-api-pri-make_first-ordered' failed | make[1]: *** [sub-api-pri-make_first-ordered] Error 2 Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependenciesAndreas Müller2017-03-011-1/+1
| | | | | | | | WARNING: QA Issue: qtbase-plugins rdepends on gtk+3, but it isn't a build dependency, missing gtk+3 in DEPENDS or PACKAGECONFIG? [build-deps] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: remove absolute binary paths from mkspec filesDaniel Mack2017-02-261-0/+4
| | | | | | | | | | | | | | | When running 'bitbake -c populate_sdk' on an image that has qt5webkit enabled, the uikit feature is enabled in qtbase, which then fails to install with error: qtbase-mkspecs-5.8.0+git0+49dc9aa409-r0 conflicts with /usr/bin/perl The culprit for this is /usr/lib/qt5/mkspecs/features/uikit/devices.pl, which has #!/usr/bin/perl hardcoded. Fix this in a similar way other recipes do it as well and strip out these bits at install time. Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDKSchrempf Frieder2017-02-261-1/+5
| | | | | | | | | | | | The patch 0008-configure-paths-for-target-qmake-properly.patch seems to be intended for the target, not for native/nativesdk, as it breaks the mkspec setting (sets linux-g++ instead of linux-oe-g++) by default. This issue is also described here: https://github.com/graugans/meta-udoo/issues/20#issuecomment-261241783 Signed-off-by: Frieder Schrempf <frieder.schrempf@exceet.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5_base.bbclass: set qt.conf by environment variable againAndreas Müller2017-02-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Qt update to 5.8 caused fallout in meta-qt5-extra. It turned out that qmake pulled in many pointers to native sysroot. Native sysroot is qmake's default in case no configuration file qt.conf is set. The problem with the new way of setting qt.conf by cmd parameter is that is has to be set explicitly. For instance all the packages coming from [1] use autotools for configuration. These ask qmake for paths during configuration and build further Makefiles during compile. To patch these for additional cmd parameter is nasty business. Setting qt.conf when building all qtbase's causes errors during configuration. To fix this we set the filename to a non existent file so that Qt's default is used. This dirty hack was necessary because there was no way found to export an empty variable OE_QMAKE_QTCONF_PATH. This patch was tested by building huge parts of meta-qt5-extra. The meta-layers did not yet contain oe-core's recipe-specific-sysroot changes so master build might fail for missing dependencies. [1] http://www.rncbc.org/drupal/ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: create empty oe-device-extra.priHerve Jourdain2017-02-021-0/+3
| | | | | | | | During configure, it complains it can't find oe-device-extra.pri, but it doesn't result in any error. Fix it, though, just in case. Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.8Samuli Piippo2017-01-261-71/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad. Removes qtdeclarative-render2d [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Remove comments about ICU and QtWebKitAndreas Oberritter2016-12-171-5/+0
| | | | | | | | QtWebKit doesn't depend on icu in qtbase. It just didn't enable it manually before. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 18:47:41 +0000