Mirror of https://code.qt.io/cgit/yocto/meta-qt5.git https://git.enea.com/cgit/linux/meta-qt5.git/atom?h=v5.13.0-beta4 2019-05-23T07:06:25+00:00 2019-05-23T07:06:25+00:00 Mikko Gronoff mikko.gronoff@qt.io 2019-05-05T17:34:26+00:00 urn:sha1:5bbb8d27ca10c38300bfc0c31c68470eb32b7711 Update to Qt 5.13.0 beta4 Task-number: QTBUG-72311 Change-Id: Ia25415c4fb796bbc7335ae468030be4634ca4085 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> 2019-05-03T09:25:44+00:00 Mikko Gronoff mikko.gronoff@qt.io 2019-05-03T09:24:15+00:00 urn:sha1:e26163d066a867ca8f630f7caffff207ef26b4a7 * qtyocto/5.12: 89ac66b Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12 f087aeb Revert "qtbase: Adjust target mkspec settings" 8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch 7dc422d qtwayland: check also that the destination for private headers exists before installing them 84d647a qtwayland: improve manual header installation 3d60f9a qtwayland: workaround upstream bug: install missing headers manually eb5d6da qtwayland: disable gold for all archs like in qtbase e2707a0 qt5: upgrade to 5.12.3 0778424 qtbase: disable gold for all archs not just x86 4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase 8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28 95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks a4bf240 qtbase-native: add native libdir to search path adf7f60 qt5: patch build paths from installed files 28d4bfd Upgrade to 5.12.2 5a32838 layer.conf: Add warrior to compatible release series Conflicts: recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch Change-Id: Iec1b6e65f8dfbb73ab96d68a91ff6a5e7d93c7de 2019-05-03T08:03:12+00:00 Mikko Gronoff mikko.gronoff@qt.io 2019-05-02T09:55:00+00:00 urn:sha1:89ac66bf3969b48eb771ef4c06a0b8df00fd178a * qtyocto/upstream/warrior: 8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch 7dc422d qtwayland: check also that the destination for private headers exists before installing them 84d647a qtwayland: improve manual header installation 3d60f9a qtwayland: workaround upstream bug: install missing headers manually eb5d6da qtwayland: disable gold for all archs like in qtbase e2707a0 qt5: upgrade to 5.12.3 0778424 qtbase: disable gold for all archs not just x86 4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase 8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28 95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks a4bf240 qtbase-native: add native libdir to search path adf7f60 qt5: patch build paths from installed files 28d4bfd Upgrade to 5.12.2 5a32838 layer.conf: Add warrior to compatible release series 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/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtcharts_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/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/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: I085dfdddbf7915f776bd48a6d26ecf96777d9d19 2019-05-03T08:00:01+00:00 Mikko Gronoff mikko.gronoff@qt.io 2019-05-02T06:18:31+00:00 urn:sha1:f087aeb1e988fcb0597fcf2b27981b1803909276 This reverts commits 77ed8fb225093148583d4d119b89c26d4acc4ee5 & 47d1132b1dc2521299f5041dbb61c8afc29461fd "qtbase: fix target mkspec adjustment" These changes cause QTBUG-75513. Conflicts: recipes-qt/qt5/qtbase_git.bb Task-number: QTBUG-75513 Change-Id: I917bda1b7f6eb70c137070ae0ca0a66e160de523 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> 2019-04-26T09:35:47+00:00 Mikko Gronoff mikko.gronoff@qt.io 2019-04-26T09:33:42+00:00 urn:sha1:0778f92089010ac7e2c3ee1f36c8c9d5c102bbf9 * qtyocto/5.12: 3c86e3c qt5; update submodules f2b9b30 qt5: update submodules 51064b4 qt3d-runtime: update to v2.3 e413185 qtbase-native: add native libdir to search path 9a61679 opcua: add license used in open62541 3rdparty sources 7742142 qtopcua: update recipe d4f557a qt5: update submodules bd7a586 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12 0b0a608 qtbase: let user decide how to link openssl to Qt5 libraries 47d1132 qtbase: fix target mkspec adjustment 87f0462 qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS fe88b99 nativesdk-qtbase: use rpath for nativesdk Qt tools 92c34de qt5: cleanup mkspecs e117b58 qtbase: Fix test builds with clang/x86_64 6280bef qtscript: add fix for build with gcc 8.3 77ed8fb qtbase: Adjust target mkspec settings 26205f4 qt5: update submodules 126927e qt5: update submodules 75c7d00 qt5-creator: Do not ship two desktop files 6629131 packagegroup-qt5-toolchain-target: add qtbase-tools 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/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtcharts_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/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/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: I9991c57607dbbe4f6352eb586a61e2f4796128f5 2019-04-26T06:37:13+00:00 Mikko Gronoff mikko.gronoff@qt.io 2019-04-25T09:43:31+00:00 urn:sha1:a2158ae2f8e347335b0e96f5524f173078819eee Update to latest content in Qt 5.13.0 beta3 branch Task-number: QTBUG-72311 Change-Id: I2834d7de5c10dbf1fa15997cb54111d9bce989c1 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> 2019-04-26T06:31:50+00:00 Martin Jansa Martin.Jansa@gmail.com 2019-04-23T09:33:45+00:00 urn:sha1:8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38 * v5.12.3 tags in qt3d, qtknx, qtmqtt, qtopcua, qttools, qtremoteobjects are fine now Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2019-04-22T20:09:04+00:00 Martin Jansa Martin.Jansa@gmail.com 2019-04-22T20:09:03+00:00 urn:sha1:7dc422d94a0028cd5b31aff4e1c5409fb3f66dc4 * it looks like with 5.12 the QtCompositor headers are actually in QtWaylandCompositor directory and ${D}${includedir}/QtCompositor/${SHRT_VER}/QtCompositor/private/ doesn't exist causing do_install to fail $ ls /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwayland/5.12.3+gitAUTOINC+bcdc00bcdc-r0/image/usr/include/QtWaylandCompositor/5.12.3/QtWaylandCompositor/private/ qtwaylandcompositor-config_p.h qwaylandpointer_p.h qwayland-server-wayland.h qwaylandxdgdecorationv1_p.h qwldatadevice_p.h wayland-hardware-integration-server-protocol.h qtwaylandcompositorglobal_p.h qwaylandqtwindowmanager_p.h qwayland-server-xdg-decoration-unstable-v1.h qwaylandxdgshellintegration_p.h qwldataoffer_p.h wayland-ivi-application-server-protocol.h qwaylandcompositorextension_p.h qwaylandquickhardwarelayer_p.h qwayland-server-xdg-shell.h qwaylandxdgshell_p.h qwldatasource_p.h wayland-qt-key-unstable-v1-server-protocol.h qwaylandcompositor_p.h qwaylandquickitem_p.h qwayland-server-xdg-shell-unstable-v5_p.h qwaylandxdgshellv5integration_p.h qwlhardwarelayerintegrationfactory_p.h wayland-qt-windowmanager-server-protocol.h qwaylanddestroylistener_p.h qwaylandquickshellsurfaceitem_p.h qwayland-server-xdg-shell-unstable-v6.h qwaylandxdgshellv5_p.h qwlhardwarelayerintegration_p.h wayland-server-buffer-extension-server-protocol.h qwaylandinputmethodcontrol_p.h qwaylandseat_p.h qwaylandshell_p.h qwaylandxdgshellv6integration_p.h qwlhardwarelayerintegrationplugin_p.h wayland-text-input-unstable-v2-server-protocol.h qwaylandiviapplication_p.h qwayland-server-hardware-integration.h qwaylandsurface_p.h qwaylandxdgshellv6_p.h qwlhwintegration_p.h wayland-touch-extension-server-protocol.h qwaylandivisurfaceintegration_p.h qwayland-server-ivi-application.h qwaylandtextinputmanager_p.h qwlbuffermanager_p.h qwlqtkey_p.h wayland-wayland-server-protocol.h qwaylandivisurface_p.h qwayland-server-qt-key-unstable-v1.h qwaylandtextinput_p.h qwlclientbufferintegrationfactory_p.h qwlqttouch_p.h wayland-xdg-decoration-unstable-v1-server-protocol.h qwaylandkeyboard_p.h qwayland-server-qt-windowmanager.h qwaylandtouch_p.h qwlclientbufferintegration_p.h qwlregion_p.h wayland-xdg-shell-server-protocol.h qwaylandkeymap_p.h qwayland-server-server-buffer-extension.h qwaylandview_p.h qwlclientbufferintegrationplugin_p.h qwlserverbufferintegrationfactory_p.h wayland-xdg-shell-unstable-v5-server-protocol_p.h qwaylandoutputmode_p.h qwayland-server-text-input-unstable-v2.h qwaylandwlshellintegration_p.h qwlclientbuffer_p.h qwlserverbufferintegration_p.h wayland-xdg-shell-unstable-v6-server-protocol.h qwaylandoutput_p.h qwayland-server-touch-extension.h qwaylandwlshell_p.h qwldatadevicemanager_p.h qwlserverbufferintegrationplugin_p.h Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2019-04-22T12:39:19+00:00 Martin Jansa Martin.Jansa@gmail.com 2019-04-22T11:18:11+00:00 urn:sha1:84d647afc8fd96f6ca9ff1600cbaad130df998e4 * allow to disable this completely with QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY e.g. in case you already have your own bbappend resolving this differently * use SHRT_VER variable and allow to change it in .bbappend e.g. in webOS we have different version with different format without "+git" and 5.11.3-2 ended in upstream_pv which caused do_install to fail because ${D}${includedir}/QtWaylandClient/5.11.3-2 doesn't exist, split the PV by + as well - to cover both schemes and allow users to set SHRT_VER to something else if they have even weirder PV * install the QtCompositor headers in the same way as QtWaylandClient we have custom compositor and with 5.11 it was failing to build because of missing headers, so I had this in .bbappend already (I thought it was only our issue, because we were using 5.4 based QtWayland with 5.11, but the same happends with 5.6 based one and probably newer as well (I don't know what qtwayland version Andreas was using when first sending the previous qtwayland patch). * with 5.4 QtWayland and 5.11, I've updated sync.profile with %inject_headers and @private_headers built even with this sync.profile change the syncqt.pl in do_install doesn't install these 5.4 specific profile headers and qtwayland-webos and luna-surfacemanager fail to build. This is the diff between: recipe-sysroot-native/usr/bin/syncqt.pl -version 4.5.2 -showonly with Qt 5.6 and 5.11 @@ -1,6 +1,5 @@ -<srcbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git -<bldbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git -<outbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git +<srcbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git +<outbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git pmtrace_qtwaylandclient_provider.h [QtWaylandClient] qtwaylandclienttracer.h [QtWaylandClient] qwaylandabstractdecoration_p.h [QtWaylandClient] @@ -34,34 +33,6 @@ qwaylandwlshellsurface_p.h [QtWaylandClient] qwaylandxdgshell_p.h [QtWaylandClient] qwaylandxdgsurface_p.h [QtWaylandClient] -qwayland-hardware-integration.h [QtWaylandClient] -qwayland-output-extension.h [QtWaylandClient] -qwayland-qt-windowmanager.h [QtWaylandClient] -qwayland-qtkey-extension.h [QtWaylandClient] -qwayland-server-buffer-extension.h [QtWaylandClient] -qwayland-sub-surface-extension.h [QtWaylandClient] -qwayland-surface-extension.h [QtWaylandClient] -qwayland-text.h [QtWaylandClient] -qwayland-text-input-unstable-v2.h [QtWaylandClient] -qwayland-touch-extension.h [QtWaylandClient] -qwayland-wayland.h [QtWaylandClient] -qwayland-windowmanager.h [QtWaylandClient] -qwayland-xdg-shell-unstable-v6.h [QtWaylandClient] -qwayland-xdg-shell.h [QtWaylandClient] -wayland-hardware-integration-client-protocol.h [QtWaylandClient] -wayland-output-extension-client-protocol.h [QtWaylandClient] -wayland-qt-windowmanager-client-protocol.h [QtWaylandClient] -wayland-qtkey-extension-client-protocol.h [QtWaylandClient] -wayland-server-buffer-extension-client-protocol.h [QtWaylandClient] -wayland-sub-surface-extension-client-protocol.h [QtWaylandClient] -wayland-surface-extension-client-protocol.h [QtWaylandClient] -wayland-text-client-protocol.h [QtWaylandClient] -wayland-text-input-unstable-v2-client-protocol.h [QtWaylandClient] -wayland-touch-extension-client-protocol.h [QtWaylandClient] -wayland-wayland-client-protocol.h [QtWaylandClient] -wayland-windowmanager-client-protocol.h [QtWaylandClient] -wayland-xdg-shell-client-protocol.h [QtWaylandClient] -wayland-xdg-shell-unstable-v6-client-protocol.h [QtWaylandClient] qwaylandclientbufferintegration_p.h [QtWaylandClient] qwaylandclientbufferintegrationfactory_p.h [QtWaylandClient] qwaylandclientbufferintegrationplugin_p.h [QtWaylandClient] @@ -84,38 +55,6 @@ SYMBOL: QWaylandEglWindow qwaylandglcontext.h [QtWaylandClient] SYMBOL: QWaylandGLContext -qwayland-server-wayland.h [QtCompositor] -qwayland-server-hardware-integration.h [QtCompositor] -qwayland-server-input-method.h [QtCompositor] -qwayland-server-ivi-application.h [QtCompositor] -qwayland-server-output-extension.h [QtCompositor] -qwayland-server-qt-windowmanager.h [QtCompositor] -qwayland-server-qtkey-extension.h [QtCompositor] -qwayland-server-server-buffer-extension.h [QtCompositor] -qwayland-server-sub-surface-extension.h [QtCompositor] -qwayland-server-surface-extension.h [QtCompositor] -qwayland-server-text.h [QtCompositor] -qwayland-server-text-input-unstable-v2.h [QtCompositor] -qwayland-server-touch-extension.h [QtCompositor] -qwayland-server-windowmanager.h [QtCompositor] -qwayland-server-xdg-shell-unstable-v6.h [QtCompositor] -qwayland-server-xdg-shell.h [QtCompositor] -wayland-hardware-integration-server-protocol.h [QtCompositor] -wayland-input-method-server-protocol.h [QtCompositor] -wayland-ivi-application-server-protocol.h [QtCompositor] -wayland-output-extension-server-protocol.h [QtCompositor] -wayland-qt-windowmanager-server-protocol.h [QtCompositor] -wayland-qtkey-extension-server-protocol.h [QtCompositor] -wayland-server-buffer-extension-server-protocol.h [QtCompositor] -wayland-sub-surface-extension-server-protocol.h [QtCompositor] -wayland-surface-extension-server-protocol.h [QtCompositor] -wayland-text-input-unstable-v2-server-protocol.h [QtCompositor] -wayland-text-server-protocol.h [QtCompositor] -wayland-touch-extension-server-protocol.h [QtCompositor] -wayland-wayland-server-protocol.h [QtCompositor] -wayland-windowmanager-server-protocol.h [QtCompositor] -wayland-xdg-shell-server-protocol.h [QtCompositor] -wayland-xdg-shell-unstable-v6-server-protocol.h [QtCompositor] pmtrace_qtwayland_provider.h [QtCompositor] qtwaylandtracer.h [QtCompositor] qwaylandbufferref.h [QtCompositor] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2019-04-22T12:39:16+00:00 Andreas Müller schnitzeltony@gmail.com 2019-01-25T23:00:15+00:00 urn:sha1:3d60f9a4047979587624ad97776530cc807ef21c Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>