summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
Commit message (Collapse)AuthorAgeFilesLines
* qt5: update submodulesMikko Gronoff2017-10-041-1/+1
| | | | | | | Update Qt submodules to 5.9.2 RC Change-Id: I5ba3e4a141e8712a4bfea8ed79c56232356c66c5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2017-09-291-1/+1
| | | | | | | Update submodules to first 5.9.2 branch snapshot Change-Id: If1a6cff5a23bfa1e72b65b5d1f679a3ff64f7c6c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9Mikko Gronoff2017-09-251-6/+46
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtyocto/upstream/master: qtwebengine: add patch for long paths qtwebengine: update 0004-Force-host-toolchain-configuration.patch qtwebengine: fix build with glibc-2.26 qt: upgrade to latest revision in 5.9 branch qt: refresh remaining patches and add links to meta-qt5 repos qtwebengine: add a fix for building demobrowser without printing support Upgrade to Qt 5.9.0 qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: disable gold to work around binutils bug qtwebengine: disable SECURITY_STRINGFORMAT to fix the build meta-toolchain-qt5: don't rely on COREBASE/LICENSE qtbase: fix Krogoth build regression from efa8aaf qt3d: refresh patches qtwebengine: refresh patches qtbase: refresh the patches gstreamer1.0-plugins-bad: add qt5 packageconfig qtbase: remove qtbase-native from DEPENDS qt3d: Fix build with clang qtwebkit: Backport a patch to fix build with icu-59 quazip: update to 0.7.3 and add missing metadata qtbase: Use sched_yield instead of pthread_yield qtbase: Fix ptests with clang qt5-ptest: fix build with yocto < 2.3 (pyro) qtbase: add ptest qwt-qt5.inc: fix QA warning qt5-git.inc: set CVE_PRODUCT to qt python-pyqt5: include QtWidgets module qt5-creator: Link with libexecinfo on musl qtvirtualkeyboard: Include sys/time.h qtwebengine: Fix build on musl qt5-creator: Fix build with NO_ACCESSIBILITY maliit-framework-qt5: Always have optimize flags qtbase-native: Fix qdbuscpp2xml segfault qt5-ptest.inc: append do_populate_sysroot only for target qtwebengine: fix build with gcc7 qwt-qt5: Fix rpath issues qtquickcontrols2: fix compilation of examples/texteditor qtquick1: add ptest qtdeclarative: add ptest qtxmlpatterns: add ptest qt5: add qt5-ptest.inc QtSystems module not updated as newer version fails to build with Yocto. Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtenginio_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit-examples_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb Task-number: QTBUG-62635 Change-Id: I32dbc0b9c26916d57865a08ec6d55cd175c28fd0
| * 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>
* | Use correct HostPrefixSamuli Piippo2017-09-121-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 Change-Id: I75a21d9f84f02b2fc1195d810bb3c2d6bdcdd9c6 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-09-011-1/+1
| | | | | | | | | | | | | | | | Update submodules to Qt 5.9.2 (snapshot 3) Change-Id: I584ac7031ecd7eed5f63c87ee29227ccc1a94aab Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | qt5: update submodulesMikko Gronoff2017-08-231-1/+1
| | | | | | | | | | | | | | Update submodules to Qt 5.9.2 (snapshot 2) Change-Id: I6afe4211ef5ba00afc29194879bc1511ea4c5ce8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtbase: fix Krogoth build regression from efa8aafMatt Hoosier2017-08-151-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(). Change-Id: I93596ed78cba628d3b673c4fbbcff585e04d4402 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-08-141-1/+1
| | | | | | | | | | | | | | | | Update to Qt 5.9.2 (snapshot 1) Task-number: QTBUG-62447 Change-Id: I0a7f23f4efb7f07aea589fdd3f2c5bcf9a633539 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtbase: update to 5.9.1 RC3v5.9.1Mikko Gronoff2017-06-291-1/+1
| | | | | | | | | | Change-Id: Ie2e8ae52e9927d688f82fb2df538ef3e79e7a69c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-06-261-1/+1
| | | | | | | | | | | | | | Qt 5.9.1 RC2 - added 5.9.1 changefiles & updated webengine Change-Id: I09b98127a01cb67eab728e3ec7ee88a8a4f2ac9c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesSamuli Piippo2017-06-221-1/+1
| | | | | | | | | | | | | | | | Qt 5.9.1 RC Change-Id: Icc5b142d86739ac6dd298187ee22f460972fbd5b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesSamuli Piippo2017-06-121-1/+1
| | | | | | | | | | | | | | | | Latest Qt 5.9.1 Change-Id: I109b3bdd6d5a54b9bb3b1b4d86553260b7028434 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtbase: update to 5.9.0 RC2v5.9.0Samuli Piippo2017-05-291-1/+1
| | | | | | | | | | | | Change-Id: Ic8d87f53f296387a4f8757fb5045ac5f0539d289 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-05-221-1/+1
| | | | | | | | | | | | | | Update submodules to 5.9.0 RC (snapshot 1) Change-Id: I2a16101eea7fe7ae506395050f2f787a788a7a66 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-05-081-1/+1
| | | | | | | | | | | | | | | | * Update 5.9.0 submodules to Beta 4 (snapshot 1) * License file cleanup for several recipes Change-Id: Idc0b99f29a5feacf264fc668bc70129e2ed2458e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-04-271-1/+1
| | | | | | | | | | | | | | * Update submodules to 5.9.0 Beta 3 (snapshot 1) Change-Id: I7964422570d0294c40ff9da82959f7cfdc346d15 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | * Updates submodules: 5.9.0 Beta 2 (snapshot 1) -> (snapshot 2) * Include more subdirs for .qmlc packaging in qt5.inc * package qtquickcontrols specific files in qtquickcontrols recipe Change-Id: Ia30502bfae0a3dcc364cb423cc53fec3558437c4 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | qt5: update submodulesMikko Gronoff2017-04-121-1/+1
| | | | | | | | | | | | | | | | | | * Updates submodules 5.9.0 Beta --> 5.9.0 Beta 2 (snapshot 1) * Package new qml cache files (.qmlc) introduced by qtgraphicaleffects module update Change-Id: I726e092db2dd1e9057d9a79321b38c69623f1077 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | qt: update submodulesMikko Gronoff2017-04-051-1/+1
| | | | | | | | | | | | | | * Update submodules to 5.9.0 Beta RC2 Change-Id: Ideadb932f699118b513a612a35a9c8e107d7ed0f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-03-311-1/+1
| | | | | | | | | | | | | | | | * Update submodules to 5.9.0 Beta RC1 * Removed obsolete temporary build fix patch from qt3d Change-Id: Iee1e0c64792ee17fce947d9e68a143b09e77c31a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9Mikko Gronoff2017-03-291-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: nativesdk-qtbase: pass -no-icu for deterministic builds qtwebengine: show progress for do_compile packagegroup-qt5-toolchain-target: add qtquickcontrols2 package qtwebengine: add commercial license qtbase-native; do not build qdbuscpp2xml and qdbusxml2cpp bootstrapped packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5. qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependencies qtbase: remove absolute binary paths from mkspec files qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDK Change-Id: I99806099ccf7af78d61cba2df96b436cea76ddac
| * 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>
* | qt5: update submodules to 5.9.0 pre-beta snapshot 2Mikko Gronoff2017-03-231-3/+2
| | | | | | | | | | | | | | * Removed xrender packageconfig from qtbase Change-Id: Ic6f2d4180780e7d45ceb9f7dea90d2ad315f17e9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodules to 5.9.0 pre-beta snapshotMikko Gronoff2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | * Obsolete qttools patch removed (lucene removed from qttools) * 2 obsolete qtwebkit patched removed * Added a header inclusion patch to qt3d to fix build break Change-Id: I11e4ae66051322bcd77ca0884298fc804d2d26f8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-03-171-1/+1
| | | | | | | | | | | | | | | | * qtlocation module has a new 3rd party submodule "mapbox-gl-native" added under src/3rdparty folder. Change-Id: Ie5b21245bcf61b42b044e8121368d28b96a824f8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9Mikko Gronoff2017-02-221-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: populate_sdk_qt5: use _append operator qmake5_base.bbclass: set qt.conf by environment variable again Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb Change-Id: I8f47b06f1143be1a399ab4e8d2aa9cf32df4ad25
| * 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>
* | Merge remote-tracking branch 'qtyocto/5.8' into 5.9Mikko Gronoff2017-02-151-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtyocto/5.8 (upstream/master): qtwebkit: depends on gperf-native qtwebengine: disable generate_character_data qtwayland: fix build without xkbcommon-evdev qtwayland: Add libxkbcommon in the dependencies qtbase: create empty oe-device-extra.pri cmake_qt5.bbclass: add qtbase-native to DEPENDS Upgrade to Qt 5.8 qtbase: Remove comments about ICU and QtWebKit qtwebkit: Always enable icu in QT_CONFIG qtwebengine: use QT_GIT_PROTOCOL variable Change-Id: Idf617e8301dfa820b8fbbbdb2e09e53d18bcc8ae
| * 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>
| * qt5: Use existing variables for paths of host toolsAndreas Oberritter2016-11-011-2/+2
| | | | | | | | | | | | | | | | 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 Qt 5.9.0Samuli Piippo2017-02-131-4/+2
| | | | | | | | | | | | Change-Id: I446186476047563fd5377662d1827c45c2394140 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesv5.8.0Mikko Gronoff2017-01-201-1/+1
| | | | | | | | | | Change-Id: Idc8d2c2437851f6e3c562351aa09e6ecdeec0f74 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-01-111-1/+1
| | | | | | | | | | Change-Id: Iee3607e25b8d897df8346963198a36001f2936a0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtbase: use virtual/mesa for libgbmSamuli Piippo2017-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | Mesa is still the main source for libgbm. Although there are other providers for it (TI,renesas) there is still no virtual/libgbm that could be used. In those cases, the PACKAGECONFIG needs to be overridden to change the dependency. Change-Id: Ifbe176fda23ededd6e0c564aaca1cbbc2fac82e8 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2016-12-301-1/+1
| | | | | | | | | | Change-Id: I1ffc72225816505274ac847f8e18c2fc56b9428e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-08-04 12:42:56 +0000