aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/nativesdk-qtbase_git.bb
Commit message (Collapse)AuthorAgeFilesLines
* qtbase: replace the fix for gcc-4.8 with the one from upstreamupstream/jansa/master-5.12Martin Jansa2018-12-241-3/+3
| | | | | | | | | | | | | | | | | | | * fixes: | In file included from ../include/QtCore/qendian.h:1:0, | from /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+13ed06640c-r0/git/src/corelib/codecs/qutfcodec.cpp:43: | ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]�: | ../include/QtCore/../../../git/src/corelib/global/qendian.h:167:36: required from here | ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]� not a return-statement | } | ^ | ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = float]�: | ../include/QtCore/../../../git/src/corelib/global/qendian.h:172:29: required from here | ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = float]� not a return-statement | ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = double]�: | ../include/QtCore/../../../git/src/corelib/global/qendian.h:177:29: required from here | ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = double]� not a return-statement Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix build with gcc 4.8Khem Raj2018-12-241-3/+4
| | | | | | | | | | | Fixes errors like In file included from ../include/QtCore/qendian.h:1:0, from TOPDIR/build/tmp/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+13ed06640c-r0/git/src/corelib/codecs/qutfcodec.cpp:43: ../include/QtCore/../../../git/src/corelib/global/qendian.h:165:61: error: redeclaration ‘constexpr T qbswap(T) [with T = qfloat16]’ differs in ‘constexpr’ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: use v5.12.0 as baseMartin Jansa2018-12-211-4/+5
| | | | | | | | | | | | * restore 0018-Fix-compile-issue-with-gcc-9.patch which is only in v5.12.1 * zlib detection got broken probably in: commit e80bf655e922e9864f8843b5e7bbb47019a6d95a Author: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Date: Thu Dec 7 19:30:07 2017 +0100 configure: verify header presence against sources Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.12Martin Jansa2018-12-201-14/+11
| | | | | | | * WIP: only qtbase now * fixes #136 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipesMartin Jansa2018-12-201-6/+6
| | | | | | * in preparation for rebase on 5.12 #136 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix build with gcc9Khem Raj2018-12-201-0/+1
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtbase: Consider clang when computing QMAKE_CXX.COMPILER_MACROSKhem Raj2018-12-201-0/+1
| | | | | | | Helps in compiling qtapps with clang Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix build with clang/muslKhem Raj2018-12-201-0/+1
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qt5: upgrade to 5.11.3Mikko Gronoff2018-12-201-1/+1
| | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qtbase: refresh patches and update tags on meta-qt5Martin Jansa2018-11-131-3/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: don't leak absolut path to recipe specific sysrootMax Krummenacher2018-11-131-0/+1
| | | | | | | | | | | | | | If the qtbase recipe-sysroot no longer exists (e.g. because of rm_work) a user of Qt5GuiConfigExtras.cmake will experience the following error: | ERROR: Task (.../meta-qt5/recipes-qt/qt5/qtwebkit_git.bb:do_configure) failed with exit code '1' | CMake Error in Source/WebCore/CMakeLists.txt: | Imported target "Qt5::Gui_EGL" includes non-existent path | | ".../build/tmp-glibc/work/armv7at2hf-neon-imx-angstrom-linux-gnueabi/qtbase/5.11.2+gitAUTOINC+49efea26a5-r0/recipe-sysroot/usr/include/libdrm" Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* qt5: Disable ltcg for host_buildSamuli Piippo2018-11-131-0/+1
| | | | | | | | | debug-prefix-map does not work correctly for static libraries when using ltcg, and since host_build compilations link agaist the libQt5Bootstrap.a library, it breaks source file packaging into debug packages. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
* qtbase: Do not use cross_compile checkKhem Raj2018-09-251-2/+2
| | | | | | | | This check is not accepted by qmake resulting in subsequent failures in qtwebengine Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix errors due to -isystemKhem Raj2018-09-251-2/+2
| | | | | | | | | | empty out QMAKE_CFLAGS_ISYSTEM this will ensure that -isystem is not used instead it will use -I to include internal QT headers Dont hardcode QMAKE_DEFAULT_INCDIRS when cross compile Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix build error for armv8BE multilib.Lei Maohui2018-09-251-3/+4
| | | | | | | | * MJ: modified to apply correctly and to be included in native and nativesdk builds as the comment above SRC_URI says. Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: update to latest revision in 5.11 branchMartin Jansa2018-09-251-5/+5
| | | | | | | | | | * drop nobranch=1 again * update the branches and tags on meta-qt5/qt* forks and the tag name in recipes * use latest revision in 5.11 branch instead of 5.11.2 which might be removed again Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: update to Qt 5.11.2Samuli Piippo2018-09-251-4/+2
| | | | | | | | Update The-Qt-Company-Commercial license to the actual commercial license which also replaces preview license in qtbase. Remove old licenses that are no longer used in any module. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
* nativesdk-qtbase: use default PACKAGESMartin Jansa2018-09-201-15/+3
| | | | | | | * don't append -tools to all packages * fixes automatic packaging of .debug files in ${PN}-dbg Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: remove unnecessary FILES.*-dbg variables for packaging .debug filesMartin Jansa2018-09-191-6/+1
| | | | | | | | | | | | | | | | | | | | * package.bbclass can do it automatically since: commit da5ec06814e105451cca11cce76b5c5231110524 Author: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue Dec 15 15:38:54 2015 +0000 package: Add auto package splitting of .debug files * .debug files for examples were incorrectly picked by qtbase-qmlplugins-dbg causing following QE error, because unlike qtbase-examples-dbg we don't have libdir in INSANE_SKIP. ERROR: qtbase-5.11.2+gitAUTOINC+49efea26a5-r0 do_package_qa: QA Issue: qtbase-qmlplugins-dbg: found library in wrong location: /usr/share/qt5/examples/widgets/tools/plugandpaint/plugins/.debug/libpnp_extrafilters.so qtbase-qmlplugins-dbg: found library in wrong location: /usr/share/qt5/examples/widgets/tools/styleplugin/styles/.debug/libsimplestyleplugin.so qtbase-qmlplugins-dbg: found library in wrong location: /usr/share/qt5/examples/widgets/tools/echoplugin/plugins/.debug/libechoplugin.so [libdir] ERROR: qtbase-5.11.2+gitAUTOINC+49efea26a5-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix build with glibc-2.28 - for non-readers like meAndreas Müller2018-08-221-1/+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: fix build with glibc-2.28Martin Jansa2018-08-141-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* 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-3/+4
| | | | | | | | | 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-3/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* nativesdk-qtbase: add quotes to CC and CXX in environment fileSamuli Piippo2018-06-211-3/+3
| | | | | | | | CC and CXX include sysroot as argument to compiler and therefore includes spaces, which need to be quoted to work e.g., with dash. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: Update to Qt 5.11.0Samuli Piippo2018-05-301-4/+3
| | | | | | 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-6/+5
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.11 AlphaMartin Jansa2018-04-201-6/+5
| | | | | | | | | | | | | | | | | | | | | | | * 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: fix umask for do_generate_qt_environment_fileDennis Menschel2018-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom task "do_generate_qt_environment_file" generates the directory "environment-setup.d" with permission 775 instead of 755. When other recipes populate the same directory with different permissions, a package manager like RPM will report this as an error. The solution is to either set the installation permissions explicitly with "install -d [-m 755]", or specify the umask for the custom task. This commit uses the latter approach and fixes errors like the following when trying to generate an SDK: $ bitbake <image-with-qt5> -c populate_sdk [...] Error: Transaction check error: file /opt/poky/2.4.2/sysroots/x86_64-pokysdk-linux/environment-setup.d conflicts between attempted installs of nativesdk-cmake-3.8.2-r0.x86_64_nativesdk and nativesdk-qtbase-tools-5.9.4+git0+0d9208cecb-r0.x86_64_nativesdk A detailed discussion about this problem can also be found here [1]. [1] https://stackoverflow.com/a/49003464 Signed-off-by: Dennis Menschel <menschel-d@posteo.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refresh patches from meta-qt5/qt* reposMartin Jansa2018-02-261-3/+4
| | | | | | | | | | | * 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>
* 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>
* qt: refresh remaining patches and tags in meta-qt5 reposMartin Jansa2018-01-161-5/+8
| | | | | | | | | * 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>
* Fix missing OE_QMAKE_STRIP env variableLorenzo Chianura2017-12-201-0/+1
| | | | | | | | | | | | | | | | | | | | Using Qt based SDK for stripping ARM binaries results in errors. Generated Makefile contains: STRIP = \$(OE_QMAKE_STRIP) but due to the missing export of OE_QMAKE_STRIP variable STRIP will be unset and no strip will be perfomed: install -m 755 -p lib/libSigUdev.so.1.0.0 /opt/poky/2.2.1/sysroots/cortexa9hf-neon-poky-linux-gnueabi/usr/lib/libSigUdev.so.1.0.0 strip-unneeded /opt/poky/2.2.1/sysroots/cortexa9hf-neon-poky-linux-gnueabi/usr/lib/libSigUdev.so.1.0.0 make: strip-unneeded: Command not found Makefile:576: recipe for target 'install_target' failed make: [install_target] Error 127 (ignored) adding OE_QMAKE_STRIP=$STRIP to generated qt5.sh solve the issue. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.10.0Samuli Piippo2017-12-161-1/+5
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: upgrade to latest revision in 5.9 branchMartin Jansa2017-08-221-3/+3
| | | | | | * 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/+4
| | | | | | | | | | | | | | | | | | | * 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-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | * 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: 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-2/+5
| | | | | | | | | | | | * 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>
* nativesdk-qtbase: pass -no-icu for deterministic buildsDenys Dmytriyenko2017-03-161-0/+1
| | | | | | | | | | | | | Similar to qtbase-native. Otherwise it may fail with this error, if icu is not yet staged: | .../git/src/corelib/codecs/qicucodec.cpp:53:26: fatal error: unicode/ucnv.h: No such file or directory | #include "unicode/ucnv.h" | ^ | compilation terminated. Signed-off-by: Denys Dmytriyenko <denys@ti.com> 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/+0
| | | | | | | | | | | | 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>
* Upgrade to Qt 5.8Samuli Piippo2017-01-261-84/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qt5: Use existing variables for paths of host toolsAndreas Oberritter2016-11-011-1/+1
| | | | | | | | Makes it possible to install qmake into ${bindir} without setting QT_DIR_NAME = "". Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revisions in 5.7 branchMartin Jansa2016-08-051-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. * recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch was resolved in upstream commit: commit 26229cfa0b729313893af5674d604e8692dbb946 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Date: Tue Apr 26 15:08:34 2016 +0200 QDeclarativeTextInput: update API to use setBlinkingCursorEnabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revisions in 5.7 branchesMartin Jansa2016-05-021-1/+1
| | | | | | | | | | | | | | | | | * these revisions are after v5.7.0-beta1 tags where available * it's highly recommended to read: http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ to find out how you're affected check which files/tools are included in your builds, e.g. for qtwebengine: OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c 11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$ 67 ** $QT_BEGIN_LICENSE:BSD$ 17 ** $QT_BEGIN_LICENSE:FDL$ 61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$ 261 ** $QT_BEGIN_LICENSE:LGPL$ * change in chromium's LICENSE is only copyright year update Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.6 branchMartin Jansa2016-04-211-1/+1
| | | | | | | | | | | | | | * qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONFMartin Jansa2016-04-201-2/+2
| | | | | | | | | | | | * this fixes builds for DISTROs which include no-static-libraries.inc * this change depends on oe-core change: http://patchwork.openembedded.org/patch/116719/ which was merged in this form: http://patchwork.openembedded.org/patch/120513/ to Yocto 2.1, if you want to use latest meta-qt5 with older oe-core you need to append EXTRA_OECONF to PACKAGECONFIG_CONFARGS Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 22:33:04 +0000