aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
Commit message (Collapse)AuthorAgeFilesLines
* qt5: update submodulesv5.15.0Mikko Gronoff2020-05-134-4/+4
| | | | | | | | Update qtbase & qtdeclarative for Qt 5.15.0. Task-number: QTBUG-80823 Change-Id: I40b019381bba2390a8353c249acf46a5931f3314 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesv5.15.0-rc2Mikko Gronoff2020-05-1110-76/+12
| | | | | | | | Update to Qt 5.15.0 RC2 Task-number: QTBUG-80823 Change-Id: I5541f9f2ee80ddd667ad809fd034762d9b990800 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qt5: update submodulesv5.15.0-rcMikko Gronoff2020-05-0514-15/+15
| | | | | | | | Update to latest content in Qt 5.15.0 branch. Task-number: QTBUG-83792 Change-Id: I45fd0a2557a0e82aa15656ad025194be1f11ceb8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* QtWebkit: Set release build by defaultChenxi Mao2020-04-301-0/+1
| | | | | | | | | Current Qtwebkit configuration is debug build by default. Change it to release build to have better performance. Change-Id: Ib5e10bfd62edf79ddc304332ff10fdbe3abf58f0 Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* qt5: update submodulesMikko Gronoff2020-04-2840-42/+42
| | | | | | | | Update to latest content in Qt 5.15.0 branch. Task-number: QTBUG-80823 Change-Id: I1f077ce582eb831ccf68b4f2084be9d288ef1a2f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'qt/upstream/master' into 5.15Mikko Gronoff2020-04-2334-215/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Several modules are actually newer than beta4 in upstream, hence the conflicts with SRCREVs. - Replaced/removed local QPainterPath patches for qwt & creator with upstream ones. - Updated the qtwebkit SRCREV to sync with upstream as it switched to same "5.212" branch as locally already, but kept the riscv patch * upstream/master: d6b6838e qt5: upgrade to 5.15 beta4 05b3e648 qtwebkit: Switch to 5.212 branch abed512f qt5-creator: Upgrade to 4.12 branch 32c62abe qwt-qt5: fix build with Qt 5.15 44fc90ee gstreamer1.0-plugins-good: Reemove inserting qt5 from packageconfig Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-creator_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qwt/qwt-qt5_6.1.4.bb Change-Id: Icf6e747da78059c23568ea00ebbe50b28588aa3f
| * qt5: upgrade to 5.15 beta4Martin Jansa2020-04-2146-74/+74
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebkit: Switch to 5.212 branchKhem Raj2020-04-212-3848/+2
| | | | | | | | | | | | | | Drop py3 support patch as its no longer needed on this branch This is more uptodate branch and has needed fixes to work with Qt 5.15 Signed-off-by: Khem Raj <raj.khem@gmail.com>
| * qt5-creator: Upgrade to 4.12 branchKhem Raj2020-04-212-57/+3
| | | | | | | | | | | | | | | | This fixes build with - qt 5.15 QPainterPath changes - Clang-10 Signed-off-by: Khem Raj <raj.khem@gmail.com>
* | qt5: update submodulesv5.15.0-beta4Mikko Gronoff2020-04-169-10/+10
| | | | | | | | | | | | | | Update to latest content in Qt 5.15 branch. Change-Id: I97774db909f75c9fa84f45e5acc0905521e32173 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2020-04-1517-35/+35
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.15 branch Task-number: QTBUG-80823 Change-Id: I72ecac4a29bf1d1f072169d709aa7ecdc895c0e5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qt/upstream/master' into 5.15Mikko Gronoff2020-04-1561-160/+164
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Diff in SRCREVs are due checkout from commit vs. checkout from corresponding tag in modules. The content is the same. * metatypes inclusion was a bit different in upstream, synced with upstream * update module_config.yaml * upstream/master: 02930760 qtmultimedia: create /usr/lib/plugins/videoeglvideonode referenced by Qt5MultimediaConfig.cmake b8bcf8cb qt5: upgrade to 5.15 beta3 eac416fe qtdeclarative: bump SRCREV 6558d2b5 nativesdk-qtbase: fix unpackaged files 6b2323f3 qtwebengine: update patches for beta2 20ae10f0 qt5: upgrade to 5.15 beta2 a01de873 qtwebengine: fix QT_MODULE_BRANCH_CHROMIUM b88c292a qtquick3d: Fix branch for fetching assimp submodule df67d5a7 qt3d: update patch to apply a38953a6 qt5: upgrade to latest revisions in 5.15 branch 9a645b02 qtwebengine: update patches for latest 5.15 revision 6cce9817 qtwebengine: update patches for 5.15 50e35581 qtbase: update patches for latest 5.15 revision 9f024a55 qtdeclarative: add dependency on qtdeclarative-native 76125ba8 qt5.inc: package metatypes files f3379951 qtbase: drop xkb, xcb-xinput PACKAGECONFIGs 44405373 qt5: upgrade to latest revisions in 5.15 branch 5e189731 layer: Mark dunfell as the only compatible release 3e759d82 qtwebengine: Fix build with ninja >= 1.10.0 f712bf9f python-pyqt5: remove PyQt_qreal_double from DISABLED_FEATURES 79b0f3a6 python-pyqtchart: remove PyQt_qreal_double from DISABLED_FEATURES 34ae49f8 qtmultimedia: Enable gstreamer support 108b5664 gstreamer1.0-plugins-good: Turn on qt5 packageconfig 4b6ce100 qt5-creator: Inherit mime-xdg 89de99e7 python-{pyqt5,pyqtchart}: fold .inc file into .bb 5d790449 python-pyqt5: drop python 2 recipe b2a958a4 python-pyqt5: disable whole PyQt_OpenGL and QtWidgets, QtQuickWidgets, QtQuick modules without opengl in DISTRO_FEATURES Conflicts: conf/layer.conf 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/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebview_git.bb Change-Id: I61a651fd16d475ac0d8bbe119a3e3a8038692726
| * qtmultimedia: create /usr/lib/plugins/videoeglvideonode referenced by ↵Martin Jansa2020-04-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt5MultimediaConfig.cmake * using Qt5MultimediaConfig.cmake fails with error bellow, temorary fix that by creating empty directory CMake Error at /OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.camera/0.0.2-1+gitAUTOINC+a407b0443e-r0/recipe-sysroot/usr/lib/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake:31 (message): The imported target "Qt5::Multimedia" references the file "/OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.camera/0.0.2-1+gitAUTOINC+a407b0443e-r0/recipe-sysroot/usr/lib/plugins/videoeglvideonode" but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. * The installation package was faulty and contained "/OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.camera/0.0.2-1+gitAUTOINC+a407b0443e-r0/recipe-sysroot/usr/lib/cmake/Qt5Multimedia/Qt5Multimedia_QSGVideoNodeFactory_EGL.cmake" but not all the files it references. Call Stack (most recent call first): /OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.camera/0.0.2-1+gitAUTOINC+a407b0443e-r0/recipe-sysroot/usr/lib/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake:244 (_qt5_Multimedia_check_file_exists) /OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.camera/0.0.2-1+gitAUTOINC+a407b0443e-r0/recipe-sysroot/usr/lib/cmake/Qt5Multimedia/Qt5Multimedia_QSGVideoNodeFactory_EGL.cmake:5 (_populate_Multimedia_plugin_properties) /OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.camera/0.0.2-1+gitAUTOINC+a407b0443e-r0/recipe-sysroot/usr/lib/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake:253 (include) CMakeLists.txt:43 (find_package) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to 5.15 beta3Martin Jansa2020-04-0612-13/+13
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtdeclarative: bump SRCREVMartin Jansa2020-04-061-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * nativesdk-qtbase: fix unpackaged filesMartin Jansa2020-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | * fixes: ERROR: nativesdk-qtbase-5.14.99+5.15-beta2+gitAUTOINC+f515ca5dcd-r0 do_package: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped in any package: /usr/local/oecore-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/metatypes /usr/local/oecore-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/metatypes/qt5core_metatypes.json Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. nativesdk-qtbase: 2 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: update patches for beta2Martin Jansa2020-04-0331-94/+51
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to 5.15 beta2Martin Jansa2020-04-0326-27/+27
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: fix QT_MODULE_BRANCH_CHROMIUMMartin Jansa2020-04-021-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtquick3d: Fix branch for fetching assimp submoduleKhem Raj2020-03-301-1/+1
| | | | | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
| * qt3d: update patch to applyMartin Jansa2020-03-262-7/+7
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to latest revisions in 5.15 branchMartin Jansa2020-03-1835-36/+36
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: update patches for latest 5.15 revisionMartin Jansa2020-03-1829-63/+63
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: update patches for 5.15Martin Jansa2020-03-1829-37/+37
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: update patches for latest 5.15 revisionMartin Jansa2020-03-1825-107/+72
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtdeclarative: add dependency on qtdeclarative-nativeMartin Jansa2020-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes: | /OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/recipe-sysroot-native/usr/bin/qmake -install qinstall /OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/build/src/qml/qt5qml_metatypes.json ../../lib/metatypes/qt5qml_metatypes.json | /OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/recipe-sysroot-native/usr/bin/qmltyperegistrar --generate-qmltypes=plugins.qmltypes --import-name=QtQml --major-version=2 --minor-version=15 --foreign-types=/OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/recipe-sysroot/usr/lib/metatypes/qt5network_metatypes.json,/OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/recipe-sysroot/usr/lib/metatypes/qt5core_metatypes.json --dependencies=/OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/git/src/qml/dependencies.json --private-includes -o qt5qml_qmltyperegistrations.cpp qt5qml_metatypes.json | make[2]: /OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/recipe-sysroot-native/usr/bin/qmltyperegistrar: Command not found | make[2]: *** [Makefile:1680: qt5qml_qmltyperegistrations.cpp] Error 127 | make[2]: *** Waiting for unfinished jobs.... | make[2]: Leaving directory /OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/build/src/qml | make[1]: *** [Makefile:102: sub-qml-make_first-ordered] Error 2 | make[1]: Leaving directory /OE/build/luneos-zeus/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtdeclarative/5.14.99+gitAUTOINC+f7647d5ada-r0/build/src | make: *** [Makefile:50: sub-src-make_first] Error 2 | WARNING: exit code 1 from a shell command. | NOTE: recipe qtdeclarative-5.14.99+gitAUTOINC+f7647d5ada-r0: task do_compile: Failed Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5.inc: package metatypes filesMartin Jansa2020-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enabled since qtbase commit: commit c5e9d7e504172707f7705d03ae27006c45eb5eac Author: Ulf Hermann <ulf.hermann@qt.io> Date: Wed Aug 28 16:09:25 2019 +0200 Generate metatypes.json for QtCore, QtGui, and QtWidgets These libraries contain types which are exposed to QML from qtdeclarative. Change-Id: Ie0edaef94fcb40074b6f6b2ea1a1c3a77ed3e9a9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> * fixes: ERROR: qtbase-5.14.99+gitAUTOINC+2e7a28958d-r0 do_package: QA Issue: qtbase: Files/directories were installed but not shipped in any package: /usr/lib/metatypes /usr/lib/metatypes/qt5gui_metatypes.json /usr/lib/metatypes/qt5core_metatypes.json /usr/lib/metatypes/qt5widgets_metatypes.json Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. qtbase: 4 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: drop xkb, xcb-xinput PACKAGECONFIGsMartin Jansa2020-03-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | * removed from qtbase in: commit 60588e1a5dd9b10803e078c741271cbe5713a51b Author: Gatis Paeglis <gatis.paeglis@qt.io> Date: Tue Feb 19 10:09:19 2019 +0100 3rdparty: remove xcb libs and bump minimal required version to 1.11 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to latest revisions in 5.15 branchMartin Jansa2020-03-1841-44/+43
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: Fix build with ninja >= 1.10.0Andreas Müller2020-03-135-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * For now just skip version check. Looked into: ninja came from meta-oe to oe-core with: commit fc3aef67a95a90e9a485c6b0e93db8cdeab5d3ab Author: Khem Raj <raj.khem@gmail.com> Date: Thu Jul 27 21:52:12 2017 -0700 ninja: Add recipe llvm is using it, therefore move it from meta-oe Signed-off-by: Khem Raj <raj.khem@gmail.com> That was in rocko release cycle. So the assumption we have a ninja decent enough should be acceptable. * and since the upgrade to ninja-1.10.0 in: commit d1cd957cea29f3ab111ae752bc9ad75a1324c255 Author: Upgrade Helper <auh@auh.yoctoproject.org> Date: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> the do_configure task fails with: | ERROR: Feature 'webengine-system-ninja' was enabled, but the pre-condition 'tests.webengine-ninja' failed. * Looked into qtwebengine current dev branch: There is no solution yet. So as soon as upstream offers a better solution most likely this patch will not apply any more and has to be removed then. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
| * qtmultimedia: Enable gstreamer supportKhem Raj2020-03-131-1/+2
| | | | | | | | | | | | This helps qt5everywheredemo to play sample videos Signed-off-by: Khem Raj <raj.khem@gmail.com>
| * qt5-creator: Inherit mime-xdgKhem Raj2020-03-131-2/+2
| | | | | | | | | | | | | | Fixes QA warning ERROR: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: qt5-creator path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-musleabi/qt5-creator/4.9.2+gitAUTOINC+8181363fa9-r0/packages-split/qt5-creator/usr/share/applications/org.qt-project.qtcreator.desktop' [mime-xdg] Signed-off-by: Khem Raj <raj.khem@gmail.com>
* | QTWebkit: Support RISC-V ISA on QTwebkitChenxi Mao2020-04-132-1/+87
| | | | | | | | | | | | | | | | | | | | There are 3 changes to support RISC-V 1. Add a patch to support RISC-V CPU 2. Disable JIT as mips/ppc did Change-Id: I612428194c98acf0f18cec180816caa4e32ece2a Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* | QTWebKit: Fix build error on QT-5.15 branchChenxi Mao2020-04-116-3852/+6
| | | | | | | | | | | | | | | | | | | | | | | | There are 2 changes to build QtWebkit on QT-5.15 1. Move SHA1 to QTwebkit tag QtWebKit 5.212.0 Alpha 4 SHA1: 444bd2bda5fa46c2b4b99adaf6e9b2074b03a0d1 2. Remove python3 patch. Fixes: QTBUG-83426 Change-Id: I6a1f1d8a29c828e28e3c8192c1b863a85991080e Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* | QTWebkit: Move webkit sha1 to dev branch HEAD on QT-5.15Chenxi Mao2020-04-091-1/+1
| | | | | | | | | | | | | | | | | | Move QTwebkit SHA1 to dev branch HEAD: ab1bd15209abaf7effc51dbc2f272c5681af7223 Change-Id: Id0298aadb53c6626963fc29aebac497a4dad248b Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesv5.15.0-beta3Mikko Gronoff2020-04-0217-17/+17
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.15 branch. Task-number: QTBUG-80823 Change-Id: I26c9a1587483bed96361eb49f60068826f78cf73 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2020-03-2622-22/+22
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.15 branch. Task-number: QTBUG-80823 Change-Id: Ia3ef34fb1dada0b9504c0cc2ec13dbce2a1cbd34 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesv5.15.0-beta2Mikko Gronoff2020-03-1727-26/+142
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.15 branch. Task-number: QTBUG-80823 Change-Id: I30451a35af341a3ffc7636bb5018611ef6bc0016 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge "Merge remote-tracking branch 'qt/5.14' into 5.15"Mikko Gronoff2020-03-1062-90/+4170
|\ \
| * \ Merge remote-tracking branch 'qt/5.14' into 5.15Mikko Gronoff2020-03-1062-90/+4170
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qt/5.14: de2ecaa1 coin: update module_config.yaml with meta-python2 support f9a58d62 Merge remote-tracking branch 'qt/upstream/master' into 5.14 2da972e5 qt5: update submodules 9be6548e qt5: update submodules b5e4f925 qtquicktimeline: add recipe abb42351 (qt/upstream/master) qtwebview: Skip if meta-python is not present caf09cd5 Add PyQtChart. f18d5948 qtbase: fix build with platform where FE macro are not defined c8cd55b0 qtwebkit: build with python3 0bbd0ebe qtwebengine: Link libatomic on x86/32bit 23914740 Revert "qtwebkit: remove" 8cadcbcb qt5: upgrade to 5.14.1 f13a3cec packagegroup-qt5-toolchain-target: Use TUNE_PKGARCH instead of MACHINE_ARCH a35403dc qtwebkit: remove a797f85c python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2 b1f4f1fd Revert "recipes: Use python3 during build" 47fb26de recipes: Use python3 during build 4060f68d qt-kiosk-browser: Only support arm/x86 fd376e15 qtwebengine: Fix missing headers found in build with clang 7f324f11 gstreamer1.0-plugins-good: Adjust bbappend for meson migration in core 1365691f qttools: remove ptest installation 254576f9 qt-kiosk-browser: Add recipe 47399df9 nativesdk-packagegroup: fix cmake builds using sdk Conflicts: recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb 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_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtcoap_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb Change-Id: I41b3b999dc1278342e33dda3b66af1990e8da090
| | * | Merge remote-tracking branch 'qt/upstream/master' into 5.14Mikko Gronoff2020-03-0262-91/+4158
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qt/upstream/master: abb42351 qtwebview: Skip if meta-python is not present caf09cd5 Add PyQtChart. f18d5948 qtbase: fix build with platform where FE macro are not defined c8cd55b0 qtwebkit: build with python3 0bbd0ebe qtwebengine: Link libatomic on x86/32bit 23914740 Revert "qtwebkit: remove" 8cadcbcb qt5: upgrade to 5.14.1 f13a3cec packagegroup-qt5-toolchain-target: Use TUNE_PKGARCH instead of MACHINE_ARCH a35403dc qtwebkit: remove a797f85c python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2 b1f4f1fd Revert "recipes: Use python3 during build" 47fb26de recipes: Use python3 during build 4060f68d qt-kiosk-browser: Only support arm/x86 fd376e15 qtwebengine: Fix missing headers found in build with clang 7f324f11 gstreamer1.0-plugins-good: Adjust bbappend for meson migration in core 1365691f qttools: remove ptest installation 254576f9 qt-kiosk-browser: Add recipe 47399df9 nativesdk-packagegroup: fix cmake builds using sdk Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtcoap_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtlottie_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb [...] (41 conflicts) Change-Id: Ib48e50eb939e7a8d0422c0beb75863b8a4b82b15
| | | * qtwebview: Skip if meta-python is not presentKhem Raj2020-02-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It needs qtwebengine which needs python2 so skip it when python2 is not present Signed-off-by: Khem Raj <raj.khem@gmail.com>
| | | * qtbase: fix build with platform where FE macro are not definedNicola Lunghi2020-02-062-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | see added patch Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
| | | * qtwebkit: build with python3Andreas Müller2020-02-066-10/+3852
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
| | | * qtwebengine: Link libatomic on x86/32bitKhem Raj2020-02-032-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | Fixes CAS link errors Signed-off-by: Khem Raj <raj.khem@gmail.com>
| | | * Revert "qtwebkit: remove"Martin Jansa2020-02-035-0/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a35403dcf6b75ee7355108cab3e466009003b1a7. But keep the dependency from packagegroup-qt5-toolchain-target, qt5-creator removed as most people won't really need this. Andreas and meta-qt5-extra still need qtwebkit as reported here: https://github.com/meta-qt5/meta-qt5/pull/273#issuecomment-578536852 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | | * qt5: upgrade to 5.14.1Martin Jansa2020-01-2778-130/+128
| | | | | | | | | | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | | * qtwebkit: removeMartin Jansa2020-01-246-249/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * it wasn't updated for very long time and I assume that all users already migrated to qtwebengine if not let me know that you'll start maintaining this recipe Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | | * python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2Martin Jansa2020-01-242-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither of these actually builds with python3, skip them when meta-python2 isn't included until real fix is available. qtwebkit might not get the support for python3 at all qtwebengine I have some changes for the initial build, but there are many more needed as shown in upstream chromium: https://bugs.chromium.org/p/chromium/issues/detail?id=942720 https://bugs.chromium.org/p/chromium/issues/list?q=label%3AProj-Python3Migration&can=2 python-pyqt5 is already blacklisted because of sip qtwebengine with python3 shows in log.do_configure that it won't actually build qtwebengine, but it doesn't fail. do_compile fails but with a bit misleading error: ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: oe_runmake failed ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: Execution of '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/run.do_compile.16479' failed with exit code 1: cd src/ && ( test -e Makefile || /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/git/src/src.pro CONFIG+=force_debug_info QT_BUILD_PARTS-=examples QT_BUILD_PARTS-=tests 'QMAKE_CXX=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CC=x86_64-webos-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_LINK=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= ' 'QMAKE_CXXFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= -fvisibility-inlines-hidden' -after ) && make -f Makefile make[1]: Entering directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src' /bin/sh: 1: Syntax error: "(" unexpected Makefile:295: recipe for target 'errorbuild' failed make[1]: *** [errorbuild] Error 2 make[1]: Leaving directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src' Makefile:48: recipe for target 'sub-src-make_first' failed make: *** [sub-src-make_first] Error 2 WARNING: exit code 1 from a shell command. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | | * Revert "recipes: Use python3 during build"Martin Jansa2020-01-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 47fb26deddabe331514d54a5884bb319839d7de8. Neither of these actually builds with python3, it's good fix to start parsing the layer again, but better to just skip them when meta-python2 isn't available until real fix is available. qtwebkit might not get the support for python3 at all qtwebengine I have some changes for the initial build, but there are many more needed as shown in upstream chromium: https://bugs.chromium.org/p/chromium/issues/detail?id=942720 https://bugs.chromium.org/p/chromium/issues/list?q=label%3AProj-Python3Migration&can=2 python-pyqt5 is already blacklisted because of sip qtwebengine with python3 shows in log.do_configure that it won't actually build qtwebengine, but it doesn't fail. do_compile fails but with a bit misleading error: ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: oe_runmake failed ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: Execution of '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/run.do_compile.16479' failed with exit code 1: cd src/ && ( test -e Makefile || /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/git/src/src.pro CONFIG+=force_debug_info QT_BUILD_PARTS-=examples QT_BUILD_PARTS-=tests 'QMAKE_CXX=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CC=x86_64-webos-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_LINK=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= ' 'QMAKE_CXXFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= -fvisibility-inlines-hidden' -after ) && make -f Makefile make[1]: Entering directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src' /bin/sh: 1: Syntax error: "(" unexpected Makefile:295: recipe for target 'errorbuild' failed make[1]: *** [errorbuild] Error 2 make[1]: Leaving directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src' Makefile:48: recipe for target 'sub-src-make_first' failed make: *** [sub-src-make_first] Error 2 WARNING: exit code 1 from a shell command. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 22:07:53 +0000