summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit_git.bb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/upstream/master' into 5.15Jani Suonpera2020-12-041-0/+3
|\ | | | | | | | | Task-number: QTBUG-88755 Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
| * qtwebkit: Fix build with python 3.9Khem Raj2020-11-031-0/+1
| | | | | | | | | | | | backport a fix to build with python 3.9 Signed-off-by: Khem Raj <raj.khem@gmail.com>
| * qtwebkit: Fix build when Qt is configured without SSLKhem Raj2020-11-031-0/+1
| | | | | | | | | | | | backport a patch to fix the build error Signed-off-by: Khem Raj <raj.khem@gmail.com>
| * qtwebkit: Add patch to fix build with bison 3.7Andreas Müller2020-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: |... /build/DerivedSources/WebCore/XPathGrammar.cpp:120:10: fatal error: XPathGrammar.hpp: No such file or directory | 120 | #include "XPathGrammar.hpp" | | ^~~~~~~~~~~~~~~~~~ | ... | .../build/DerivedSources/WebCore/CSSGrammar.cpp:160:10: fatal error: CSSGrammar.hpp: No such file or directory | 160 | #include "CSSGrammar.hpp" | | ^~~~~~~~~~~~~~~~ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* | 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>
* | Merge remote-tracking branch 'qt/upstream/master' into 5.15Mikko Gronoff2020-04-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * qtwebkit: Switch to 5.212 branchKhem Raj2020-04-211-3/+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>
* | QTWebkit: Support RISC-V ISA on QTwebkitChenxi Mao2020-04-131-1/+4
| | | | | | | | | | | | | | | | | | | | 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-111-7/+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>
* | Merge remote-tracking branch 'qt/5.14' into 5.15Mikko Gronoff2020-03-101-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * qtwebkit: build with python3Andreas Müller2020-02-061-10/+7
| | | | | | | | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
| * Revert "qtwebkit: remove"Martin Jansa2020-02-031-0/+89
| | | | | | | | | | | | | | | | | | | | | | 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>
| * qtwebkit: removeMartin Jansa2020-01-241-89/+0
| | | | | | | | | | | | | | * 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-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * recipes: Use python3 during buildKhem Raj2020-01-201-1/+1
| | | | | | | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'qt/5.14' into 5.15Mikko Gronoff2020-01-151-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qt/5.14: f6ebff39 Merge remote-tracking branch 'qt/upstream/master' into 5.14 1b8e5570 qtbase: Use pcre packages by default fd7ac089 qt5: use PACKAGECONFIG to disable tests and examples 1a7c8fa4 qtlocation: use geoclue 2 ddbf8dd0 qtbase: use offscreen platform plugin for tools 4f701ea1 qtbase: add openssl PACKAGECONFIG for native nativesdk 56b2c13d qtbase-native: disable vulkan support 6b34fd17 maliit-framework-qt5: fix test installations aa50163c qtenginio: remove obsolete module 32edd746 ogl-runtime: update to v2.5.0 release f7dcc706 qtquick3d: add recipe b814111e qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance 1fde17e1 qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance ca649e3f qt5: Update to Qt 5.14.0 ede15adc qtbase: Fix patch fuzz detected with devtool e8221c2c qtbase: Backport the patch from upstream gerrit ca2f53f9 qt5-creator: Update musl patch to link qmldesigner with -lexecinfo 6e7cc682 qtwebengine: Move CharAllocator definition to header 33a86256 qt5-creator: Add missing dep on libz.so 3d47a569 qt5-creator: Make clang-format patch work with multiple clang versions d8f0db7f qtwebengine: Include cstddef for size_t definition b6bd407e qmllive: Fix build with multilib settings 69e1fd33 quazip: Fix multilib builds a4db065b qtwebkit: Fix linking errors on clang/mips/ppc f756a065 ogl-runtime: Only compile for supported architectures 710d995b qttools: Add option to disable qdoc a02e01ca qttools: Use CONFIG+=disable_external_rpath 0d88f448 packagegroup-qt5-toolchain-target: Make machine specific 2a2055fa recipes: Disable clang dependent recipes for riscv64/32 Conflicts: recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch Change-Id: Ie1c25965f512eccade0a7518b3a2d23c6dc6b3c1
| * qtwebkit: Fix linking errors on clang/mips/ppcKhem Raj2019-12-181-3/+7
| | | | | | | | | | | | Disable JIT on mips32/ppc as well Signed-off-by: Khem Raj <raj.khem@gmail.com>
* | Merge remote-tracking branch 'qt/5.14' into 5.15Mikko Gronoff2020-01-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: Qt License agreement update needs more recent Qt modules content from 5.15 branch. Follow-up commit (submodule update) will address the issue. * qt/5.14: 9ff0a362 coin: update poky to 3.1_M1 from master 6776ec35 qtbase, qtwebengine: address issues introduced in latest upstream merge 5b2109a8 Merge remote-tracking branch 'qt/upstream/master' into 5.14 e4e2acba qtbase: Adjust target mkspec settings e8ea2389 qt5: update submodules d8e970eb knx, opcua: update changefiles ca08d8c7 qt5: update submodules f7841daf qt5: update submodules 25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures 280139a9 qt5: update submodules 4f3ed3ed qtwebkit: add missing flex-native dep 456ec4ac qt5-creator, qtbase: Replace python with python3 f264e5dd qtdeclarative: Ask for python3 explicitly f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t b7f4bd20 recipes: Use features_check instead of distro_features_check 1a4ee018 qtwebengine: Fix musl build 02715fff pyqt5: Upgrade to 5.13.2 Conflicts: coin/module_config.yaml 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_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/qtimageformats_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 recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I98dab678c9904aef591fe933bf081b3f297e2021
| * qtwebkit: add missing flex-native depChristopher Larson2019-11-281-1/+1
| | | | | | | | Signed-off-by: Christopher Larson <chris_larson@mentor.com>
* | Merge remote-tracking branch 'qt/5.14' into 5.15Samuli Piippo2019-11-271-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qt/5.14: (22 commits) qtwebengine: add clang fix qt5: update submodules qt5: use PACKAGECONFIG to disable tests and examples qt5: update submodules qt5: update submodules qt5: update submodules qt5: update submodules ogl-runtime: update to v2.5.0 release qttools: don't install tst_qtattributionsscanner qt5: Upgrade to Qt 5.13.2 python(3)-pyqt5: add qml support libqofono: bump SRCREV and add a fix for voicecall qt5: update submodules qt5: update submodules qtbase: add openssl PACKAGECONFIG for native nativesdk ogl-runtime: update to 2.5 qtbase: Add PACKAGECONFIG for lttng layer: Mark zeus as compatible release ogl-runtime: Fix build on x86_64 README.md: Document need for 32bit host compiler ... Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
| * qt5: Upgrade to Qt 5.13.2Martin Jansa2019-10-311-5/+5
|/ | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Disable JIT for mips64Khem Raj2019-01-101-0/+4
| | | | | | | | | | | It does not build with JIT git/Source/JavaScriptCore/assembler/MacroAssembler.h:64:2: error: #error "The MacroAssembler is not supported on this platform." 64 | #error "The MacroAssembler is not supported on this platform." | ^~~~~ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Fix build with clangKhem Raj2018-12-201-0/+2
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qt: use single -dev and -staticdev packageMartin Jansa2018-09-261-1/+1
| | | | | | * don't create separate examples-dev and examples-staticdev for all modules Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Use relative paths for pri files when cross compileKhem Raj2018-09-251-2/+3
| | | | | | This helps in compiling examples etc. without hardcoded headers Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtwebkit: Make qtwebkit support arm32 BE.Lei Maohui2018-09-191-1/+2
| | | | | | | | * It can work on arm32 BE. * MJ: modified to apply correctly Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: add patches to meta-qt5 forkMartin Jansa2018-09-191-6/+8
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Fix conflicts with -I and -isystemKhem Raj2018-09-191-0/+1
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtwebkit: Fix build with muslKhem Raj2018-09-191-1/+4
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtwebkit_git.bb: Fix configure failure on bisonManjukumar Matha2018-08-171-1/+1
| | | | | | | | | | | | | | Fix the following error during do_configure | CMake Error at | Could NOT find BISON (missing: BISON_EXECUTABLE) (Required is at least | version "2.1") | Call Stack (most recent call first): Add dependency to bison-native to fix the above error Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
* qtwebengine: add -fpermissiveMartin Jansa2018-06-061-0/+5
| | | | | | | | * http://errors.yoctoproject.org/Errors/Details/179245/ just use -fpermissive in this case like fedora did: https://bugzilla.redhat.com/show_bug.cgi?id=1582954 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: do not skip build - use cmake as build systemAndreas Müller2018-06-051-28/+23
| | | | | | | | | | | | | | | | | | | | log.do_configure says: | The WebKit build was disabled for the following reasons: | * cross-compilation of QtWebKit with qmake is not supported yet | * Missing cmake from PATH | * Using cmake version , but at least cmake 2.8.12 is required to build QtWebKit. and build was finished without errors (but surprisingly fast). Looking into qtwebkit, it seems they have changed to cmake build system and Webkit.pro is just a wrapper for preparing and running cmake. For the transition the packageconfigs were translated as close as possible. 'libxcomposite' and 'libxrender' were merged to 'x11' - there is only one option 'ENABLE_X11_TARGET' available for both. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.11 AlphaMartin Jansa2018-04-201-39/+3
| | | | | | | | | | | | | | | | | | | | | | | * use qtwebkit and qtwebkit-examples from dev branch, because there is no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in qt5-git.inc nobody noticed). * qtbase: drop qml-debug options removed from qtbase in: commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1 Author: Ulf Hermann <ulf.hermann@qt.io> Date: Fri Oct 6 16:27:09 2017 +0200 Subject: Remove qml-debug configure flag and feature * qtgraphicaleffects, qtquickcontrols2, qtquickcontrols, qtvirtualkeyboard: add qtdeclarative-native dependency needed for qmlcachegen binary * qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs referenced files disappered in: commit 6882a04fb36642862b11efe514251d32070c3d65 Author: Konstantin Tokarev <annulen@yandex.ru> Date: Thu Aug 25 19:20:41 2016 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Update to latest on 5.9 branchKhem Raj2018-04-181-1/+1
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Fix build on armv7ve (rpi)Khem Raj2018-04-181-0/+8
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-git.inc: drop nobranch=1Martin Jansa2018-04-061-0/+2
| | | | | | | | | | | | | | * sneaked in with: commit 333949a8239dfa7788b35f1059614733e11a6a25 Author: Samuli Piippo <samuli.piippo@qt.io> Date: Thu Jan 26 16:54:50 2017 +0200 Upgrade to Qt 5.8 * use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't have 5.10.1 branch at all Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: refresh remaining patches and tags in meta-qt5 reposMartin Jansa2018-01-161-2/+2
| | | | | | | | | * 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>
* qt: upgrade to latest revision in 5.9 branchMartin Jansa2017-08-221-3/+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-2/+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-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | * 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>
* qtwebkit: Backport a patch to fix build with icu-59Khem Raj2017-08-101-0/+1
| | | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Tested-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: depends on gperf-nativeGordan Markuš2017-02-071-1/+1
| | | | | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.8Samuli Piippo2017-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qtwebkit: Always enable icu in QT_CONFIGAndreas Oberritter2016-12-171-0/+3
| | | | | | | Allow qtwebkit to be built even if qtbase was configured without icu. 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfigMartin Jansa2016-05-061-1/+13
| | | | | | | * fixes following QA: WARNING: qtwebkit-5.6.99+5.7.0-alpha+gitAUTOINC+e9b369b16f-r0 do_package_qa: QA Issue: qtwebkit rdepends on libxcomposite, but it isn't a build dependency? [build-deps] 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-2/+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>