From c96f9b3eba0ff3daebbf213d7abb915ebeee6f66 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 23 May 2019 12:34:34 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.12.4 branch Task-number: QTBUG-75966 Change-Id: I481a2f9a7e8ac3cd28c0c32b793c3fcd11124cb2 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 29 +++++++++++--------- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 32 +++++++++++----------- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtopcua_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 +-- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 42 files changed, 73 insertions(+), 70 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index be7b2eb6..d50571fb 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" +SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index b1e662bc..64716c26 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,26 +1,24 @@ -From 98509dbb66b3d93cdb6ca73cb5db537fa8ff8bd3 Mon Sep 17 00:00:00 2001 +From 60c8e6bd8ff8f5e4b7a986bfa35bb5d6c08626c0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build --- - qt3d.pro | 9 +++++++-- + qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- - tools/tools.pro | 2 +- + tools/tools.pro | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 847507f17..286286dd0 100644 +index d5dbda4..6809470 100644 --- a/qt3d.pro +++ b/qt3d.pro -@@ -1,5 +1,5 @@ --requires(qtHaveModule(gui)) --requires(qtConfig(opengl):!wasm) -+!tools-only:requires(qtHaveModule(gui)) -+!tools-only:requires(qtConfig(opengl):!wasm) +@@ -1,4 +1,4 @@ +-qtHaveModule(gui): \ ++!tools-only:qtHaveModule(gui): \ + requires(qtConfig(opengl):!wasm) CONFIG += examples_need_tools - load(qt_parts) @@ -15,3 +15,8 @@ load(qt_parts) OTHER_FILES += \ @@ -31,7 +29,7 @@ index 847507f17..286286dd0 100644 + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a41..e973d93dd 100644 +index 8ba2d9a..e973d93 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ @@ -42,11 +40,16 @@ index 8ba2d9a41..e973d93dd 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 121507613..24c49ad5a 100644 +index 3b457ed..9f5376a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro -@@ -1,5 +1,5 @@ +@@ -1,9 +1,9 @@ TEMPLATE = subdirs + +-!qtHaveModule(3dcore): \ ++!tools-only:!qtHaveModule(3dcore): \ + return() + QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser): { +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index c09abf5f..ccfd1a62 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "29c20fda753f25bd142e18d511d28da68c6361c2" +SRCREV = "c4b5dbe1e015889b72defca4418717c5854a7acc" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 0893a120..98678e49 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.12.3+git${SRCPV}" +PV = "5.12.4+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index eb9b5514..9d657c18 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" +SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 4d90c772..f8a438e9 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 406ea336ac2a1bc7dac055c378303f27b8a20c2d Mon Sep 17 00:00:00 2001 +From f11e7738f9cb6c3f8e3eb60e55cb1145d2c2e2f4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -21,17 +21,17 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa --- configure | 2 +- - mkspecs/features/configure.prf | 4 +-- - mkspecs/features/qt.prf | 6 ++--- + mkspecs/features/configure.prf | 4 ++-- + mkspecs/features/qt.prf | 6 +++--- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 6 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index ef7bad1bfc..dcca0f9135 100755 +index ef7bad1..dcca0f9 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 934a18a924..0f5b1b6333 100644 +index 934a18a..0f5b1b6 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { @@ -65,19 +65,19 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index d8d5acaafd..57d11420c2 100644 +index 89f4946..97c1b43 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { - !isEmpty(plug_type) { +@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { + plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) isEmpty(plug_path): \ - plug_path = $$[QT_INSTALL_PLUGINS/get] + plug_path = $$[QT_INSTALL_PLUGINS] - LIBS += -L$$plug_path/$$plug_type - } - LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -277,8 +277,8 @@ for(ever) { + LIBS += $$plug_path/$$plug_type/$$plug_name + } else { + LIBS += -l$${plug}$$qtPlatformTargetSuffix() +@@ -271,8 +271,8 @@ for(ever) { # static builds: link qml import plugins into the target. contains(all_qt_module_deps, qml): \ qtConfig(static):import_plugins:!host_build:!no_import_scan { @@ -89,7 +89,7 @@ index d8d5acaafd..57d11420c2 100644 # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..c093dd4592 100644 +index 1903e50..c093dd4 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c202c47fa1 +index 0000000..c202c47 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,39 @@ @@ -148,7 +148,7 @@ index 0000000000..c202c47fa1 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000000..5d22fb4101 +index 0000000..5d22fb4 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 00e994db..1e6af85f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" +SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 76b6dc54..ae46b980 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "912b9b3b1318aac4cef681315ae1588105eaf410" +SRCREV = "ad446ce15b43b5f9e2f6353cc64a52ac52ed98a2" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 84173957..00c76e64 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "9755f474a039756b98ce9c2bf0a69809b1396004" +SRCREV = "39ba71c1ca03ac9b640d3af44ed8e08937b8ce45" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 7c3a209f..ce44036e 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "6a8a8f328d1782319b4dc0e4b3497e6613e0f864" +SRCREV = "c6c3241a4713b3ea89837341214625514951f712" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 4465660e..9ffbe9cc 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "edabd45add4b440b40e05f742a5a3a8b124cf72e" +SRCREV = "18c303dc1ed3e8cd8577e93c5223417e320e068d" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 82ae4975..d13837a9 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "5ead393eba0fc9d7c05790887c53c3728b023195" +SRCREV = "bae6f43d8e1fafec2771bdeddffa9edaf1bf6130" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index cc19abb2..bd59b940 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "cf48d4694edd6a16cd3bf56922ab20d8bd6b7fe7" +SRCREV = "55bdecfd14b643b222a9aae05ad1671e67be02ee" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index d7481ff8..84a46f7b 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "8cf6af2c897a822e040015b169fbf13f3db63ebf" +SRCREV = "7b92bc10c5bb7b5c87421198895eae632d10702b" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 3f57d702..2795a843 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "17ac003f6072e62ba9de7e75f3de8b8509dcd2c3" +SRCREV = "43ca053b50d7ed663c6734879070186bf28a0d29" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 84102fa4..b5011a1b 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "ae6c0fe18fff0bedced9800b11940f396b66596d" +SRCREV = "1453a319a048b6b40051014a0861be048b258778" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 442ae146..2e3f4a04 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "a8ecb45143823912baef2426f8e352159fcb0f9a" +SRCREV_qtlocation = "1459f4474282c8804adf01f4faba70944771c5d7" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 46b22a01..e8199e01 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "cf41d84738f0ed0c779f75db94d413ad938fb901" +SRCREV = "667888bd8571061baebd03c2fdbc2804dbc92134" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 4e657110..6d2ea509 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "c7e735198c6cc01201f90b64c8a6d35fc40584fc" +SRCREV = "9702acf13dde540b292693f330622561c46fc589" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index d0f80291..69b21682 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "0da27832617a17788da4fdd6838f8aa6d8c70f65" +SRCREV = "be4077347fa8d492553e7e08e4fffe0f439fbd4f" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 50f9ac88..f7c580c9 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "9d61cbee4131a8b6774ba242fe6e3f2b2f5e853c" +SRCREV = "52254ed121dde68293e99b96c4713d360ff6e90a" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 4f19fdd2..6b828c82 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "45f2b4a63489c614e0060b511e00245c599fbb70" +SRCREV = "8eb2ead663a55d6c0bfd83f8914bd2369846df55" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c163ef42..a8593a82 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "db38242b288fe3ca8f7461cf344b757a9ca0947d" +SRCREV = "33e590ea30931306e055fe4a6ae38da8b3fe3d0c" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d9a027d6..6315bce6 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "718afd7c3a78a35e3f4073dc6447e6bf3fda82d4" +SRCREV = "87f79ca0cfe432b7758fa19472cc7133275818c5" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index b7b77a4e..6cd6fd92 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "043f7582bb2f611120a7693fbe75fa866d046fff" +SRCREV = "244688018624f5f753efa16f7fe6c7b60a80fda2" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 230f7350..d04bb369 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "038f6305610a80f39d3416b95b5df96fab0c801d" +SRCREV = "d7c60f5072fddf7a46f614b12062cedfde26c997" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 16599978..8b33ff3d 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "daad96b2b9a4b503aebbea4f77887973dd8ff8ee" +SRCREV = "bcb916bec1e0b5cbd169367819e825f04115751f" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 4655b2a7..83b950bc 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "6b7f7f5ceb7a230307c004021a2f16f3dabdf759" +SRCREV = "d5888b178da6d34704ee074065f176000ffaab29" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index facff866..ee2977d7 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "9102ab868037042cab292dbfaa08f8dfff8ef5a8" +SRCREV = "144916119e83e342d6b46127fb3ffabaa365b4fb" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 4b76a4f7..6287ecdd 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "208e76d05719fe2262ff6e162786894ddb3d0fb6" +SRCREV = "27da5ad525841f7b335318c620cc25410b2606e9" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 164de449..c32af669 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "fd12ae24b4542cf2f0df1a34187c4b8c0a408e01" +SRCREV = "5db971a48bb1a9ed5c4b51254e611d56680bd85a" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 25b87aa9..c3ef7336 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "fe5b4f8e7ac984cc4c9698e7d6def9be46b0df7a" +SRCREV = "fb9a1cdf638145c5003ee18da71e28e424f91b77" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index f06ca308..b3b9e4bd 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "0987e6cb7f415be17d1240c8cd71719f94a98f76" +SRCREV = "a975fdb586b87e9578f0c12afe195317dfd2cd5b" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index f1317c90..14cb77af 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "152f6935f050e83363f1b4f40c40af7f64ca5df9" +SRCREV = "56c783d8fd93b8d3e13555da6fa398ddb09cce97" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 36147c31..28a68c0d 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e70a8070ea1e7903221fb980ddf3c23f3e9b0836" +SRCREV = "07ec3a37bd6bf28a96b8ff228eea86a09550db51" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index f2a15500..ee3fd906 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "c3574f4ec36f3cab71fcb680e889afc8a16c6242" +SRCREV = "7cb725d351d909675574a764fc19dd1f53d5c3e6" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c4780d8b..e37d8d9c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -175,8 +175,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "7ba379ecfa575f871a52dc94c9f29e2bfdfc9865" -SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990" +SRCREV_qtwebengine = "ddd3d905395298188329df111d3785e07e06e0db" +SRCREV_chromium = "8d400b021591c0b619269317e239d8a750ace140" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 51cdfdb5..4a4a1617 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "10a64558ce927e2df0f2dfe7ff3d786d4737c06e" +SRCREV = "8fba2d1110bed680941c6fef8ead9bfffeaf0003" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 53dd6b15..e00a3e5c 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "c8704b3dbcfecd774244300943b1c63e2bf9841f" +SRCREV = "9db762ad97338567a614177564f68fee780fefce" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index bec8c326..e786743a 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "05657f1c4744123ff63306a56cb699f2cfbc9f92" +SRCREV = "30b6f89e3694e667aae5700e17926c1761d16d12" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 9b999b7b..781a07c2 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "719d3c88670203fca21a3433b553bc2c1434a2ac" +SRCREV = "2fe9b682bbba406356a38cc4661330259dd97b97" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d1ea2d5c..9aeba39a 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "6feae569229fa391454b76450138ce83cf326046" +SRCREV = "a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From 8bc72a78b13f2f4c5e1cebebaef9e98b9abbb056 Mon Sep 17 00:00:00 2001 From: Gaurav Kalra Date: Fri, 24 May 2019 17:25:07 +0900 Subject: qtlocation: add PACKAGECONFIGs for geoservices Signed-off-by: Gaurav Kalra Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation_git.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f4fedf14..6b09db4c 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -17,6 +17,11 @@ PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed PACKAGECONFIG[geoclue] = ",,geoclue" PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" +PACKAGECONFIG[geoservices_here] = "-feature-geoservices_here,-no-feature-geoservices_here" +PACKAGECONFIG[geoservices_mapbox] = "-feature-geoservices_mapbox,-no-feature-geoservices_mapbox" +PACKAGECONFIG[geoservices_esri] = "-feature-geoservices_esri,-no-feature-geoservices_esri" +PACKAGECONFIG[geoservices_itemsoverlay] = "-feature-geoservices_itemsoverlay,-no-feature-geoservices_itemsoverlay" +PACKAGECONFIG[geoservices_osm] = "-feature-geoservices_osm,-no-feature-geoservices_osm" PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -- cgit v1.2.3-54-g00ecf From 2a5f9415e48a38f6f4eb0cf375737a2d8438e2fe Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 30 May 2019 12:01:42 +0000 Subject: qtbase: fix build with gcc-9 * some components which use Werror started to fail with gcc-9, because of new warning: https://gcc.gnu.org/gcc-9/changes.html New warnings: -Wdeprecated-copy, implied by -Wextra, warns about the C++11 deprecation of implicitly declared copy constructor and assignment operator if one of them is user-provided. -Wdeprecated-copy-dtor also warns if the destructor is user-provided, as specified in C++11. * e.g. maliit-framework-qt5 was now failing with: maliit-framework-qt5/0.99.0+gitAUTOINC+62bd54bcde-r0/recipe-sysroot/usr/include/QtCore/qvariant.h:273:25: error: implicitly-declared 'constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)' is deprecated [-Werror=deprecated-copy] 273 | { other.d = Private(); } | ^ Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 9 +- recipes-qt/qt5/qtbase-native_git.bb | 11 +- .../qtbase/0017-Always-build-uic-and-qvkgen.patch | 28 -- .../0017-Fix-Wdeprecated-copy-warnings.patch | 371 +++++++++++++++++++++ .../qtbase/0018-Always-build-uic-and-qvkgen.patch | 28 ++ ...18-Avoid-renameeat2-for-native-sdk-builds.patch | 67 ---- ...19-Avoid-renameeat2-for-native-sdk-builds.patch | 67 ++++ .../0019-Bootstrap-without-linkat-feature.patch | 27 -- .../0020-Bootstrap-without-linkat-feature.patch | 27 ++ recipes-qt/qt5/qtbase_git.bb | 3 +- 10 files changed, 506 insertions(+), 132 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch create mode 100644 recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch create mode 100644 recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch delete mode 100644 recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 82b6da92..3c4f31cc 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.7 +# 5.12.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -41,14 +41,15 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.7 +# 5.12.meta-qt5-native.8 SRC_URI += " \ - file://0017-Always-build-uic-and-qvkgen.patch \ - file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ + file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 91ed4807..715fe6b5 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.7 +# 5.12.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -36,19 +36,20 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.7 +# 5.12.meta-qt5-native.8 SRC_URI += " \ - file://0017-Always-build-uic-and-qvkgen.patch \ - file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ + file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native SRC_URI += " \ - file://0019-Bootstrap-without-linkat-feature.patch \ + file://0020-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 69410925..00000000 --- a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b0ca5d85afd944d1e5a3df545ba99566207c184 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic and qvkgen - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch new file mode 100644 index 00000000..a5c4bd32 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch @@ -0,0 +1,371 @@ +From 3b92a70c05eebc645d83c5570dac0285f612c039 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 13 Nov 2018 17:14:43 +0100 +Subject: [PATCH] Fix -Wdeprecated-copy warnings + +Implicit copy constructors or methods are considered deprecated for +classes that has one of the two or a destructor. + +The warning is enabled with -Wextra in gcc 9 + +Change-Id: Ic9be654f2a142fb186a4d5a7d6b4f7d6f4e611d8 +Reviewed-by: Thiago Macieira + +Upstream-Status: Backport from 5.13 + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_common.prf | 19 ++++++------------- + src/corelib/io/qprocess_p.h | 3 +-- + src/corelib/kernel/qvariant.h | 5 ++++- + src/corelib/tools/qbytearraylist.h | 2 +- + src/corelib/tools/qlist.h | 6 +++++- + src/corelib/tools/qstringlist.h | 2 +- + src/gui/painting/qtriangulator_p.h | 2 ++ + src/gui/text/qtextobject.h | 1 + + src/widgets/styles/qstyleoption.h | 23 +++++++++++++++++++++++ + 9 files changed, 44 insertions(+), 19 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 6cb2e78c1c..1cf2d45168 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -89,14 +89,8 @@ clang { + greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond + # GCC 7 has a lot of false positives relating to this, so disable completely + greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow +- # GCC 9 has a lot of false positives relating to this, so disable completely +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy +- # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move +- # GCC 9 introduced this ++ # GCC 9 introduced -Wformat-overflow in -Wall, but it is buggy: + greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow +- # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime + } + + warnings_are_errors:warning_clean { +@@ -136,14 +130,13 @@ warnings_are_errors:warning_clean { + + # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs. + greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=implicit-fallthrough +- # GCC 9 has a lot of false positives relating to this, so disable completely +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy ++ # GCC 9 introduced -Wdeprecated-copy in -Wextra, but we are not clean for it. ++ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy + # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move ++ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=redundant-move + # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow +- # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime ++ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=init-list-lifetime ++ + # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135 + android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix + } +diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h +index aa7ecbe91d..eb2d1ed048 100644 +--- a/src/corelib/io/qprocess_p.h ++++ b/src/corelib/io/qprocess_p.h +@@ -108,8 +108,7 @@ using QProcEnvKey = QByteArray; + class QProcEnvValue + { + public: +- QProcEnvValue() {} +- QProcEnvValue(const QProcEnvValue &other) { *this = other; } ++ QProcEnvValue() = default; + explicit QProcEnvValue(const QString &value) : stringValue(value) {} + explicit QProcEnvValue(const QByteArray &value) : byteValue(value) {} + bool operator==(const QProcEnvValue &other) const +diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h +index ff73c27b6e..2394dc58f8 100644 +--- a/src/corelib/kernel/qvariant.h ++++ b/src/corelib/kernel/qvariant.h +@@ -396,10 +396,13 @@ class Q_CORE_EXPORT QVariant + : type(variantType), is_shared(false), is_null(false) + {} + +- inline Private(const Private &other) Q_DECL_NOTHROW ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ++ Private(const Private &other) Q_DECL_NOTHROW + : data(other.data), type(other.type), + is_shared(other.is_shared), is_null(other.is_null) + {} ++ Private &operator=(const Private &other) Q_DECL_NOTHROW = default; ++#endif + union Data + { + char c; +diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h +index ed014dd157..3b5266492f 100644 +--- a/src/corelib/tools/qbytearraylist.h ++++ b/src/corelib/tools/qbytearraylist.h +@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods + { + #ifndef Q_QDOC + protected: +- ~QListSpecialMethods() {} ++ ~QListSpecialMethods() = default; + #endif + public: + inline QByteArray join() const +diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h +index 49ccbc9c9f..1e77b08a15 100644 +--- a/src/corelib/tools/qlist.h ++++ b/src/corelib/tools/qlist.h +@@ -72,7 +72,7 @@ template class QSet; + template struct QListSpecialMethods + { + protected: +- ~QListSpecialMethods() {} ++ ~QListSpecialMethods() = default; + }; + template <> struct QListSpecialMethods; + template <> struct QListSpecialMethods; +@@ -237,6 +237,8 @@ public: + // can't remove it in Qt 5, since doing so would make the type trivial, + // which changes the way it's passed to functions by value. + inline iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i){} ++ inline iterator &operator=(const iterator &o) Q_DECL_NOTHROW ++ { i = o.i; return *this; } + #endif + inline T &operator*() const { return i->t(); } + inline T *operator->() const { return &i->t(); } +@@ -290,6 +292,8 @@ public: + // can't remove it in Qt 5, since doing so would make the type trivial, + // which changes the way it's passed to functions by value. + inline const_iterator(const const_iterator &o) Q_DECL_NOTHROW : i(o.i) {} ++ inline const_iterator &operator=(const const_iterator &o) Q_DECL_NOTHROW ++ { i = o.i; return *this; } + #endif + #ifdef QT_STRICT_ITERATORS + inline explicit const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {} +diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h +index 10cbad04d6..693cfe30c4 100644 +--- a/src/corelib/tools/qstringlist.h ++++ b/src/corelib/tools/qstringlist.h +@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods + { + #ifndef Q_QDOC + protected: +- ~QListSpecialMethods() {} ++ ~QListSpecialMethods() = default; + #endif + public: + inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive); +diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h +index 8f043fc925..c9ae2571f4 100644 +--- a/src/gui/painting/qtriangulator_p.h ++++ b/src/gui/painting/qtriangulator_p.h +@@ -93,6 +93,8 @@ public: + return indices16.size(); + } + ++ QVertexIndexVector() = default; ++ QVertexIndexVector(const QVertexIndexVector &other) = default; + inline QVertexIndexVector &operator = (const QVertexIndexVector &other) + { + if (t == UnsignedInt) +diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h +index 067f8473ea..694eb729d5 100644 +--- a/src/gui/text/qtextobject.h ++++ b/src/gui/text/qtextobject.h +@@ -263,6 +263,7 @@ public: + iterator() : p(nullptr), b(0), e(0), n(0) {} + #if QT_VERSION < QT_VERSION_CHECK(6,0,0) + iterator(const iterator &o) : p(o.p), b(o.b), e(o.e), n(o.n) {} ++ iterator &operator=(const iterator &o) = default; + #endif + + QTextFragment fragment() const; +diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h +index 8ae07efc81..763575ff5b 100644 +--- a/src/widgets/styles/qstyleoption.h ++++ b/src/widgets/styles/qstyleoption.h +@@ -118,6 +118,7 @@ public: + + QStyleOptionFocusRect(); + QStyleOptionFocusRect(const QStyleOptionFocusRect &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionFocusRect &operator=(const QStyleOptionFocusRect &other) = default; + + protected: + QStyleOptionFocusRect(int version); +@@ -142,6 +143,7 @@ public: + + QStyleOptionFrame(); + QStyleOptionFrame(const QStyleOptionFrame &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionFrame &operator=(const QStyleOptionFrame &other) = default; + + protected: + QStyleOptionFrame(int version); +@@ -171,6 +173,7 @@ public: + QStyleOptionTabWidgetFrame(); + inline QStyleOptionTabWidgetFrame(const QStyleOptionTabWidgetFrame &other) + : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionTabWidgetFrame &operator=(const QStyleOptionTabWidgetFrame &other) = default; + + protected: + QStyleOptionTabWidgetFrame(int version); +@@ -194,6 +197,7 @@ public: + + QStyleOptionTabBarBase(); + QStyleOptionTabBarBase(const QStyleOptionTabBarBase &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionTabBarBase &operator=(const QStyleOptionTabBarBase &other) = default; + + protected: + QStyleOptionTabBarBase(int version); +@@ -225,6 +229,7 @@ public: + + QStyleOptionHeader(); + QStyleOptionHeader(const QStyleOptionHeader &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionHeader &operator=(const QStyleOptionHeader &other) = default; + + protected: + QStyleOptionHeader(int version); +@@ -247,6 +252,7 @@ public: + + QStyleOptionButton(); + QStyleOptionButton(const QStyleOptionButton &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionButton &operator=(const QStyleOptionButton &other) = default; + + protected: + QStyleOptionButton(int version); +@@ -284,6 +290,7 @@ public: + + QStyleOptionTab(); + QStyleOptionTab(const QStyleOptionTab &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionTab &operator=(const QStyleOptionTab &other) = default; + + protected: + QStyleOptionTab(int version); +@@ -314,6 +321,7 @@ public: + int midLineWidth; + QStyleOptionToolBar(); + QStyleOptionToolBar(const QStyleOptionToolBar &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionToolBar &operator=(const QStyleOptionToolBar &other) = default; + + protected: + QStyleOptionToolBar(int version); +@@ -341,6 +349,7 @@ public: + + QStyleOptionProgressBar(); + QStyleOptionProgressBar(const QStyleOptionProgressBar &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionProgressBar &operator=(const QStyleOptionProgressBar &other) = default; + + protected: + QStyleOptionProgressBar(int version); +@@ -371,6 +380,7 @@ public: + + QStyleOptionMenuItem(); + QStyleOptionMenuItem(const QStyleOptionMenuItem &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionMenuItem &operator=(const QStyleOptionMenuItem &other) = default; + + protected: + QStyleOptionMenuItem(int version); +@@ -390,6 +400,7 @@ public: + + QStyleOptionDockWidget(); + QStyleOptionDockWidget(const QStyleOptionDockWidget &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionDockWidget &operator=(const QStyleOptionDockWidget &other) = default; + + protected: + QStyleOptionDockWidget(int version); +@@ -441,6 +452,7 @@ public: + + QStyleOptionViewItem(); + QStyleOptionViewItem(const QStyleOptionViewItem &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionViewItem &operator=(const QStyleOptionViewItem &other) = default; + + protected: + QStyleOptionViewItem(int version); +@@ -471,6 +483,7 @@ public: + + QStyleOptionToolBox(); + QStyleOptionToolBox(const QStyleOptionToolBox &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionToolBox &operator=(const QStyleOptionToolBox &other) = default; + + protected: + QStyleOptionToolBox(int version); +@@ -490,6 +503,7 @@ public: + + QStyleOptionRubberBand(); + QStyleOptionRubberBand(const QStyleOptionRubberBand &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionRubberBand &operator=(const QStyleOptionRubberBand &other) = default; + + protected: + QStyleOptionRubberBand(int version); +@@ -508,6 +522,7 @@ public: + + QStyleOptionComplex(int version = QStyleOptionComplex::Version, int type = SO_Complex); + QStyleOptionComplex(const QStyleOptionComplex &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionComplex &operator=(const QStyleOptionComplex &other) = default; + }; + + #if QT_CONFIG(slider) +@@ -532,6 +547,7 @@ public: + + QStyleOptionSlider(); + QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionSlider &operator=(const QStyleOptionSlider &other) = default; + + protected: + QStyleOptionSlider(int version); +@@ -551,6 +567,7 @@ public: + + QStyleOptionSpinBox(); + QStyleOptionSpinBox(const QStyleOptionSpinBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionSpinBox &operator=(const QStyleOptionSpinBox &other) = default; + + protected: + QStyleOptionSpinBox(int version); +@@ -578,6 +595,7 @@ public: + + QStyleOptionToolButton(); + QStyleOptionToolButton(const QStyleOptionToolButton &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionToolButton &operator=(const QStyleOptionToolButton &other) = default; + + protected: + QStyleOptionToolButton(int version); +@@ -600,6 +618,7 @@ public: + + QStyleOptionComboBox(); + QStyleOptionComboBox(const QStyleOptionComboBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionComboBox &operator=(const QStyleOptionComboBox &other) = default; + + protected: + QStyleOptionComboBox(int version); +@@ -618,6 +637,7 @@ public: + + QStyleOptionTitleBar(); + QStyleOptionTitleBar(const QStyleOptionTitleBar &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionTitleBar &operator=(const QStyleOptionTitleBar &other) = default; + + protected: + QStyleOptionTitleBar(int version); +@@ -638,6 +658,7 @@ public: + + QStyleOptionGroupBox(); + QStyleOptionGroupBox(const QStyleOptionGroupBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionGroupBox &operator=(const QStyleOptionGroupBox &other) = default; + protected: + QStyleOptionGroupBox(int version); + }; +@@ -652,6 +673,7 @@ public: + + QStyleOptionSizeGrip(); + QStyleOptionSizeGrip(const QStyleOptionSizeGrip &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionSizeGrip &operator=(const QStyleOptionSizeGrip &other) = default; + protected: + QStyleOptionSizeGrip(int version); + }; +@@ -668,6 +690,7 @@ public: + + QStyleOptionGraphicsItem(); + QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionGraphicsItem &operator=(const QStyleOptionGraphicsItem &other) = default; + static qreal levelOfDetailFromTransform(const QTransform &worldTransform); + protected: + QStyleOptionGraphicsItem(int version); diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..7ae15d0a --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 0db28cf06f557a714f8cffafbfcdbe68378c8f8a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic and qvkgen + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch deleted file mode 100644 index 0ca038f5..00000000 --- a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 69aeac9c7233e0d76a8a00b1a45c53c1670c9b49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 14 Apr 2019 13:27:58 +0200 -Subject: [PATCH] Avoid renameeat2 for native(sdk) builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This -causes massive failures at do_install [2] on qtbase. - -To work around tell Qt build configuration not to use ranameet2 independent -of glibc version. - -[1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 -[2] https://github.com/meta-qt5/meta-qt5/issues/187 - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Andreas Müller ---- - src/corelib/global/qconfig-bootstrapped.h | 4 ++-- - src/corelib/io/qfilesystemengine_unix.cpp | 10 ---------- - 2 files changed, 2 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index dfcc3c9c7f..30166fe41c 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -100,14 +100,14 @@ - #define QT_FEATURE_process -1 - #define QT_FEATURE_regularexpression -1 - #ifdef __GLIBC_PREREQ --# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_renameat2 -1 - #else - # define QT_FEATURE_renameat2 -1 - #endif - #define QT_FEATURE_sharedmemory -1 - #define QT_FEATURE_slog2 -1 - #ifdef __GLIBC_PREREQ --# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_statx -1 - #else - # define QT_FEATURE_statx -1 - #endif -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index b2d81066db..d1783ebdf3 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy - if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) - return emptyFileEntryWarning(), false; - --#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) -- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) -- return true; -- -- // We can also get EINVAL for some non-local filesystems. -- if (errno != EINVAL) { -- error = QSystemError(errno, QSystemError::StandardLibraryError); -- return false; -- } --#endif - #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) - if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) - return true; diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch new file mode 100644 index 00000000..b3c2c767 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch @@ -0,0 +1,67 @@ +From 0c79a6761e75441f433fd397bc3b79e78b6c5ef8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 14 Apr 2019 13:27:58 +0200 +Subject: [PATCH] Avoid renameeat2 for native(sdk) builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This +causes massive failures at do_install [2] on qtbase. + +To work around tell Qt build configuration not to use ranameet2 independent +of glibc version. + +[1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 +[2] https://github.com/meta-qt5/meta-qt5/issues/187 + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller +--- + src/corelib/global/qconfig-bootstrapped.h | 4 ++-- + src/corelib/io/qfilesystemengine_unix.cpp | 10 ---------- + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index dfcc3c9c7f..30166fe41c 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -100,14 +100,14 @@ + #define QT_FEATURE_process -1 + #define QT_FEATURE_regularexpression -1 + #ifdef __GLIBC_PREREQ +-# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_renameat2 -1 + #else + # define QT_FEATURE_renameat2 -1 + #endif + #define QT_FEATURE_sharedmemory -1 + #define QT_FEATURE_slog2 -1 + #ifdef __GLIBC_PREREQ +-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_statx -1 + #else + # define QT_FEATURE_statx -1 + #endif +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index b2d81066db..d1783ebdf3 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy + if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) + return emptyFileEntryWarning(), false; + +-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) +- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) +- return true; +- +- // We can also get EINVAL for some non-local filesystems. +- if (errno != EINVAL) { +- error = QSystemError(errno, QSystemError::StandardLibraryError); +- return false; +- } +-#endif + #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) + if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) + return true; diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index a1d08236..00000000 --- a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 703f89e35aaaec5ad781c222ae2dcd30f31320e9 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 30166fe41c..e06f75541b 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -91,7 +91,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..e681bfbb --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From d52010c7d58f1a25f51a909b3179df656ed9d9c4 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 24 Nov 2017 15:16:31 +0200 +Subject: [PATCH] Bootstrap without linkat feature + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index 30166fe41c..e06f75541b 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -91,7 +91,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9183ecf6..c1f6cfba 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.7 +# 5.12.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -32,6 +32,7 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # for syncqt -- cgit v1.2.3-54-g00ecf From e172b875372c075b92903cfbe279a0e08552fa84 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 31 May 2019 13:35:46 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.12.4 branch. Task-number: QTBUG-75966 Change-Id: I5e6112e2f7fad5ae8b192963de3f27f0d3c9e30f Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index ccfd1a62..38973679 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "c4b5dbe1e015889b72defca4418717c5854a7acc" +SRCREV = "eab523957ac77542758f0172f0396c865933b200" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index ae46b980..ccca7967 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "ad446ce15b43b5f9e2f6353cc64a52ac52ed98a2" +SRCREV = "8ca2dfa61c61280205af9ff9a6607a1794b5cd25" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 00c76e64..d410b353 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "39ba71c1ca03ac9b640d3af44ed8e08937b8ce45" +SRCREV = "e7051e75c7004baf19a296cbb4f08a80f397b3f7" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 9ffbe9cc..6369a6c0 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "18c303dc1ed3e8cd8577e93c5223417e320e068d" +SRCREV = "41d93443ab264b4a0869290929e2de84b4a3c494" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index d13837a9..05fa8e66 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "bae6f43d8e1fafec2771bdeddffa9edaf1bf6130" +SRCREV = "48b4df598c88782f031f3df62964e159feeb20fb" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index bd59b940..9d872f72 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "55bdecfd14b643b222a9aae05ad1671e67be02ee" +SRCREV = "4ac7a6de3e5ed4e44ba8923852c71bcc8327d95b" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 2e3f4a04..82a45641 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "1459f4474282c8804adf01f4faba70944771c5d7" +SRCREV_qtlocation = "24273e2249082a904b326c16a1913bcef3a37367" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 69b21682..5ca64f55 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "be4077347fa8d492553e7e08e4fffe0f439fbd4f" +SRCREV = "d0b28afe0e57857152a61f4a1d2b0dfe7a4bb6bb" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 6b828c82..246fed6f 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "8eb2ead663a55d6c0bfd83f8914bd2369846df55" +SRCREV = "780bf06b9a938380eb9221532465db0d3069f38a" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index a8593a82..9fa1475e 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "33e590ea30931306e055fe4a6ae38da8b3fe3d0c" +SRCREV = "783bfd2182f667817213faf3f54a285057bd2456" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 6315bce6..74794eee 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "87f79ca0cfe432b7758fa19472cc7133275818c5" +SRCREV = "8105e3ed0e77f363ccc6406edd38082ac5cef27d" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index d04bb369..123570f5 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "d7c60f5072fddf7a46f614b12062cedfde26c997" +SRCREV = "a3d8a431aaed65ee49cc9405f4f1ebd9e268a008" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 8b33ff3d..6a6ddef0 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "bcb916bec1e0b5cbd169367819e825f04115751f" +SRCREV = "45626a32aff0ff2ce279a94e18d58aee5583b4f9" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 83b950bc..22c419a1 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "d5888b178da6d34704ee074065f176000ffaab29" +SRCREV = "6e30eaa1bda78b16fe9f467ad328a085bb3def09" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index c32af669..8fdc29db 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "5db971a48bb1a9ed5c4b51254e611d56680bd85a" +SRCREV = "29249cf721863cdebdce5d48ded59e295f58a710" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 14cb77af..8a82aa75 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "56c783d8fd93b8d3e13555da6fa398ddb09cce97" +SRCREV = "9d6cdde0ae4213eb7cc53baab22e183f3c93507d" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index ee3fd906..d4f7363d 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "7cb725d351d909675574a764fc19dd1f53d5c3e6" +SRCREV = "b79562247f6dfe2ad26804c0eca891a529179dd0" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e37d8d9c..2303faa0 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -175,8 +175,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "ddd3d905395298188329df111d3785e07e06e0db" -SRCREV_chromium = "8d400b021591c0b619269317e239d8a750ace140" +SRCREV_qtwebengine = "da67565737b564e1951b15c6b7756783c88ab438" +SRCREV_chromium = "11c5d00ab758576925308e2b508b798a4bf0ac3c" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 4a4a1617..9d7e2068 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "8fba2d1110bed680941c6fef8ead9bfffeaf0003" +SRCREV = "ccf8f2f2b1729149965921462d9c2d3e5dd8f57a" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index e786743a..41159731 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "30b6f89e3694e667aae5700e17926c1761d16d12" +SRCREV = "9ca4eec0bc5c0fa9d4ab76df5eb06129765bc09a" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 9aeba39a..a2b845b2 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c" +SRCREV = "4efc4b1d0c11b68e1140734f659b22ce266d1bd6" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From a28765bf60028e7dc59130432edf16782b77a438 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 31 May 2019 14:49:58 +0300 Subject: Allow enabling gui for native and nativesdk Some Qt build tools may depend on QtGui, which need platform plugins for running them. Use minimal platform plugin since no interaction with the tool is expected. Add PACKAGECONFIGs that can be used to enable gui and image format plugins for the native and nativesdk builds. Task-number: AUTOSUITE-1009 Change-Id: I39a9c5612da2c84be44e55665a970ed2a2fd512f Reviewed-by: Nikolay Zamotaev Reviewed-by: Mikko Gronoff --- classes/qmake5_base.bbclass | 1 + recipes-qt/qt5/nativesdk-qtbase_git.bb | 10 +++++----- recipes-qt/qt5/qtbase-native_git.bb | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 20ff33d4..fb5f9364 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -110,6 +110,7 @@ generate_qt_config_file_effective_paths() { cat >> ${OE_QMAKE_QTCONF_PATH} < ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" +SRCREV = "e67ae0d62f4fdf0bd3cd95a7e9443c90c361e58d" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index bd5b67ee..a0dff4ff 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" +SRCREV = "e67ae0d62f4fdf0bd3cd95a7e9443c90c361e58d" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index ea059dde..73f9c3d7 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "a87188ace95ad9818e078aae72cfab7ea4a9cfaa" +SRCREV = "ea80013b2e990c8c28a9dfe7d6afaaa250bf2402" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 5cf0a893..5eb34607 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "326463142b42b03c0e4c59069e099d6fd27212ce" +SRCREV = "eb5e165deb3bccdae40c146e3d311464b7548641" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a13bd6b0..cfcfad8e 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1aba2b28920229aa547470a6c3f3b443d7da6b3a" +SRCREV = "79037e46eeb00e20c5f3bbe7d0de4b702af86884" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From bf4633263e3390c9fb737b3e18d62db684785764 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 10 Jun 2019 09:28:49 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.12.4 branch. Task-number: QTBUG-75966 Change-Id: Idff739848eea3b1fe0ac90a1ef372aa681c8c0a1 Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index d50571fb..1f125fb1 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" +SRCREV = "7932c99a31493add24f683a974042c8c80d74fc1" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 9d657c18..e9b8e56c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" +SRCREV = "7932c99a31493add24f683a974042c8c80d74fc1" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1e6af85f..3e805c51 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" +SRCREV = "7932c99a31493add24f683a974042c8c80d74fc1" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index ce44036e..dec0b6b4 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c6c3241a4713b3ea89837341214625514951f712" +SRCREV = "f6be1f73a810514335ab3d27e1d05825a36b06af" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index b5011a1b..a8a1d646 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "1453a319a048b6b40051014a0861be048b258778" +SRCREV = "83d506042d7c4475578c860d7a9ccd07299da026" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 82a45641..96fb663d 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "24273e2249082a904b326c16a1913bcef3a37367" +SRCREV_qtlocation = "2e02797471e55684a71979f330a4f507e86e5bcc" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 6d2ea509..ff7ee5be 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "9702acf13dde540b292693f330622561c46fc589" +SRCREV = "d73b59093ec6fed8138460adcdf3ea0a45519a3c" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 6cd6fd92..51c50524 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "244688018624f5f753efa16f7fe6c7b60a80fda2" +SRCREV = "0cdd47b80f26f5e7bb86b34ce31f07bbe2f49640" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index ee2977d7..3d7ea28f 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "144916119e83e342d6b46127fb3ffabaa365b4fb" +SRCREV = "76a08e3d59a0ef7020464d73df6dd5a01e58c230" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 6287ecdd..bb9a79df 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "27da5ad525841f7b335318c620cc25410b2606e9" +SRCREV = "68327f976994cc941b58c2b2e3eb7726809509fd" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index c3ef7336..e9309a9c 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "fb9a1cdf638145c5003ee18da71e28e424f91b77" +SRCREV = "af241efd145cd6e9c8b8b4107fc0a7b78da16c4c" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index b3b9e4bd..209c0907 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "a975fdb586b87e9578f0c12afe195317dfd2cd5b" +SRCREV = "41dc0e7c0f3e1183b22d85114b013925a1d44319" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 28a68c0d..0a51ff29 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "07ec3a37bd6bf28a96b8ff228eea86a09550db51" +SRCREV = "2e4246ee71dd6689d3731e380f393185a1e3bd8e" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 2303faa0..34882215 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -175,8 +175,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "da67565737b564e1951b15c6b7756783c88ab438" -SRCREV_chromium = "11c5d00ab758576925308e2b508b798a4bf0ac3c" +SRCREV_qtwebengine = "80674ddb452c6926a01fcb0f35699252cf452043" +SRCREV_chromium = "bd792030e194a0bcce4defbf2298041244b54121" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -- cgit v1.2.3-54-g00ecf From 2d768e8a2fc3cfd789e3ad79c8088fa5cd7e7f03 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 11 Jun 2019 09:26:10 +0300 Subject: qt5: update submodules Update to Qt 5.13.0 release Task-number: QTBUG-72311 Change-Id: I60c1d76bfe8338ca92d5122766ea005fb3417a0f Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e39fbb02..ea30edfc 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "e67ae0d62f4fdf0bd3cd95a7e9443c90c361e58d" +SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 1dd5df21..cd7e47f8 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "e67ae0d62f4fdf0bd3cd95a7e9443c90c361e58d" +SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a0dff4ff..4e8dd167 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "e67ae0d62f4fdf0bd3cd95a7e9443c90c361e58d" +SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 5eb34607..c9eb1c81 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "eb5e165deb3bccdae40c146e3d311464b7548641" +SRCREV = "c7c3e2f26af0842631c95f054600b6b90ef3675b" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf From b4061d651c97663002bb514521e2b97e3c3b9e80 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 12 Jun 2019 12:01:35 +0300 Subject: qtbase, qttools: update modules Update qtbase & qttools with latest fixes for 5.13.0. Amends commit 2d768e8a2fc3cfd789e3ad79c8088fa5cd7e7f03. Task-number: QTBUG-72311 Change-Id: I8aa04e5d005a1007f1643fcaf7c9c90d8b05368a Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ea30edfc..44c2cd3c 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" +SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index cd7e47f8..b916ed95 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" +SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4e8dd167..8077d76b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" +SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index c9eb1c81..e33d17d2 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "c7c3e2f26af0842631c95f054600b6b90ef3675b" +SRCREV = "cc9250477eaa71a3f3ffd050591d4a9d835288ca" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf From be7aa4b95623ca068a4c7f84edf6c74e03c8854f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 13 Jun 2019 10:19:52 +0300 Subject: qtbase: update module Update to latest revision in Qt 5.12.4 branch. Task-number: QTBUG-75966 Change-Id: Id72264952f7036a93e8f584eb0e38e5b5f99cd52 Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 1f125fb1..539ab4e6 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "7932c99a31493add24f683a974042c8c80d74fc1" +SRCREV = "d8efc8d718e3b3a0464f321e740541f5b221a5d6" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index e9b8e56c..33b3e5f1 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "7932c99a31493add24f683a974042c8c80d74fc1" +SRCREV = "d8efc8d718e3b3a0464f321e740541f5b221a5d6" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3e805c51..6af47f20 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "7932c99a31493add24f683a974042c8c80d74fc1" +SRCREV = "d8efc8d718e3b3a0464f321e740541f5b221a5d6" -- cgit v1.2.3-54-g00ecf From 0aff334c0e744f0e0a3041c147fc263a24f5f1b4 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 14 Jun 2019 08:48:06 +0300 Subject: qtbase: update module Update qtbase with latest fixes for 5.13.0. Amends commit 2d768e8a2fc3cfd789e3ad79c8088fa5cd7e7f03. Task-number: QTBUG-72311 Change-Id: Icb0a0b01b95cc760df68ac89bec5afdbf20e76f1 Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 44c2cd3c..ae1cc441 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" +SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index b916ed95..663924dc 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" +SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8077d76b..077cc651 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" +SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" -- cgit v1.2.3-54-g00ecf From e33d86095392f20a6301ab33472736b34a869339 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 24 Jun 2019 10:49:59 +0300 Subject: qt3d-runtime: update to ogl-runtime v2.4 Qt 3D Studio Runtime 2.x switches/upgrades to OpenGL Runtime with version update 2.3 -> 2.4. Contains new 3rdparty submodule EASTL (Electronic Arts Standard Template Library), recipe adjusted accordingly. Change-Id: Iebb2399f5f837e556cf9d59629d663c66d2f622d Reviewed-by: Kari Hormi --- recipes-qt/qt5/ogl-runtime_git.bb | 25 +++++++++++++++++++++++++ recipes-qt/qt5/qt3d-runtime_git.bb | 16 ---------------- 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 recipes-qt/qt5/ogl-runtime_git.bb delete mode 100644 recipes-qt/qt5/qt3d-runtime_git.bb (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb new file mode 100644 index 00000000..c2009418 --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -0,0 +1,25 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ +" + +DEPENDS += "qtbase qtdeclarative" + +QT_MODULE_BRANCH = "2.4" +QT_MODULE_BRANCH_EASTL = "master" +QT_GIT_PROJECT = "qt3dstudio" +PV = "2.4+git${SRCPV}" + +SRC_URI += " \ + ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ +" + +SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" +SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" +SRCREV = "${SRCREV_ogl-runtime}" + +SRCREV_FORMAT = "ogl-runtime_EASTL" diff --git a/recipes-qt/qt5/qt3d-runtime_git.bb b/recipes-qt/qt5/qt3d-runtime_git.bb deleted file mode 100644 index fb018e58..00000000 --- a/recipes-qt/qt5/qt3d-runtime_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -require qt5.inc -require qt5-git.inc - -LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ -" - -DEPENDS += "qtbase qtdeclarative qt3d" - -QT_MODULE_BRANCH = "2.3" -QT_GIT_PROJECT = "qt3dstudio" -PV = "2.3+git${SRCPV}" - -SRCREV = "5e0bfe934b9930b7e41d457b4f88fce91342a0ea" -- cgit v1.2.3-54-g00ecf From 54a84562efd7c7eca1f605e93fb15aa2527d27c7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 3 Jul 2019 14:32:09 +0300 Subject: qttranslations: qmlviewer and qtquick1 helps are removed Change-Id: Ib4ea0c20d653ab60161d7be235a001d54022f57e Reviewed-by: Kari Hormi --- recipes-qt/qt5/qttranslations_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 8b13dba7..bbaee2ef 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native" do_install_append() { # remove qtquick1 translations - qtquick1 is gone - for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do + for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do rm $transfile done } -- cgit v1.2.3-54-g00ecf From 584d86653c658afa3e16bff095101ed11cf61d31 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 4 Jul 2019 10:02:13 +0300 Subject: qtcoap: add optional dependency to qtdeclarative examples have dependency to qml and quick. Change-Id: I2df3ef185f30a5c9d25ebd8134f86f653a97be9f Reviewed-by: Kari Hormi --- recipes-qt/qt5/qtcoap_git.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index d73c1ace..db0bb8e6 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " +PACKAGECONFIG ?= "qtdeclarative" +PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" + DEPENDS += "qtbase" SRCREV = "18289e7c1d2778460dccb1135fe283bd234954ad" -- cgit v1.2.3-54-g00ecf From 9978929f1f0cc33cc57e9e9529c1cc108c80107f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 26 Jul 2019 09:31:02 +0300 Subject: qtvirtualkeyboard: update supported layouts Update PACKAGECONFIGs with all the supported keyboard layouts. Change-Id: I943629b33f6132a68f49f83bcf02e6d822ddb34f Reviewed-by: Kwangsub Kim Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 8a82aa75..264175bc 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -19,23 +19,45 @@ PACKAGECONFIG[t9write] = "CONFIG+=t9write" PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" +PACKAGECONFIG[lang-bg_BG] = "CONFIG+=lang-bg_BG" +PACKAGECONFIG[lang-cs_CZ] = "CONFIG+=lang-cs_CZ" PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" +PACKAGECONFIG[lang-el_GR] = "CONFIG+=lang-el_GR" PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" +PACKAGECONFIG[lang-en_US] = "CONFIG+=lang-en_US" PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" +PACKAGECONFIG[lang-es_MX] = "CONFIG+=lang-es_MX" +PACKAGECONFIG[lang-et_EE] = "CONFIG+=lang-et_EE" PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" +PACKAGECONFIG[lang-fr_CA] = "CONFIG+=lang-fr_CA" PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" +PACKAGECONFIG[lang-he_IL] = "CONFIG+=lang-he_IL" PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" +PACKAGECONFIG[lang-hr_HR] = "CONFIG+=lang-hr_HR" +PACKAGECONFIG[lang-hu_HU] = "CONFIG+=lang-hu_HU" +PACKAGECONFIG[lang-id_ID] = "CONFIG+=lang-id_ID" PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" +PACKAGECONFIG[lang-ms_MY] = "CONFIG+=lang-ms_MY" PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" +PACKAGECONFIG[lang-nl_NL] = "CONFIG+=lang-nl_NL" PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" +PACKAGECONFIG[lang-pt_BR] = "CONFIG+=lang-pt_BR" PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" PACKAGECONFIG[lang-ro_RO] = "CONFIG+=lang-ro_RO" PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" +PACKAGECONFIG[lang-sk_SK] = "CONFIG+=lang-sk_SK" +PACKAGECONFIG[lang-sl_SI] = "CONFIG+=lang-sl_SI" +PACKAGECONFIG[lang-sq_AL] = "CONFIG+=lang-sq_AL" +PACKAGECONFIG[lang-sr_SP] = "CONFIG+=lang-sr_SP" PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" +PACKAGECONFIG[lang-th_TH] = "CONFIG+=lang-th_TH" +PACKAGECONFIG[lang-tr_TR] = "CONFIG+=lang-tr_TR" +PACKAGECONFIG[lang-uk_UA] = "CONFIG+=lang-uk_UA" +PACKAGECONFIG[lang-vi_VN] = "CONFIG+=lang-vi_VN" PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" -- cgit v1.2.3-54-g00ecf From e0cee22dcdbf141a103175c62dae8bc0b965558e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 2 Aug 2019 12:45:34 +0300 Subject: ogl-runtime: fix build errors Add qtquickcontrols2 dependency for the viewer and a workaround patch for failed examples (QTBUG-77288) Change-Id: If7481ee63cb6633bfd38f92267f87cc3ff158607 Reviewed-by: Mikko Gronoff --- .../0001-Fix-examples-build-error.patch | 62 ++++++++++++++++++++++ recipes-qt/qt5/ogl-runtime_git.bb | 3 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch new file mode 100644 index 00000000..0d2f165f --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch @@ -0,0 +1,62 @@ +From 4fa69c1c5396bded20edccb2a1dd9b61f0b1140d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 2 Aug 2019 12:39:50 +0300 +Subject: [PATCH] Fix examples build error + +Add workaround for QTBUG-77288 which causes examples to fail to build + +Signed-off-by: Samuli Piippo +--- + examples/studio3d/cppdatainput/cppdatainput.pro | 1 + + examples/studio3d/dynamicelement/dynamicelement.pro | 1 + + examples/studio3d/qmldatainput/qmldatainput.pro | 1 + + examples/studio3d/simpleqml/simpleqml.pro | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/examples/studio3d/cppdatainput/cppdatainput.pro b/examples/studio3d/cppdatainput/cppdatainput.pro +index 20b5c68..bbb403a 100644 +--- a/examples/studio3d/cppdatainput/cppdatainput.pro ++++ b/examples/studio3d/cppdatainput/cppdatainput.pro +@@ -1,5 +1,6 @@ + CONFIG += c++11 + QT += widgets qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET + INSTALLS += target +diff --git a/examples/studio3d/dynamicelement/dynamicelement.pro b/examples/studio3d/dynamicelement/dynamicelement.pro +index 1b804fd..ae3c005 100644 +--- a/examples/studio3d/dynamicelement/dynamicelement.pro ++++ b/examples/studio3d/dynamicelement/dynamicelement.pro +@@ -1,6 +1,7 @@ + TEMPLATE = app + + QT += qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + SOURCES += \ + demo.cpp \ +diff --git a/examples/studio3d/qmldatainput/qmldatainput.pro b/examples/studio3d/qmldatainput/qmldatainput.pro +index 9bafed5..496c2c1 100644 +--- a/examples/studio3d/qmldatainput/qmldatainput.pro ++++ b/examples/studio3d/qmldatainput/qmldatainput.pro +@@ -1,6 +1,7 @@ + TEMPLATE = app + + QT += widgets qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + integrity: DEFINES += USE_EMBEDDED_FONTS + +diff --git a/examples/studio3d/simpleqml/simpleqml.pro b/examples/studio3d/simpleqml/simpleqml.pro +index 62afa78..1a0784b 100644 +--- a/examples/studio3d/simpleqml/simpleqml.pro ++++ b/examples/studio3d/simpleqml/simpleqml.pro +@@ -1,6 +1,7 @@ + TEMPLATE = app + + QT += widgets qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + SOURCES += \ + main.cpp diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index c2009418..7d31b2a8 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ " -DEPENDS += "qtbase qtdeclarative" +DEPENDS += "qtbase qtdeclarative qtquickcontrols2" QT_MODULE_BRANCH = "2.4" QT_MODULE_BRANCH_EASTL = "master" @@ -16,6 +16,7 @@ PV = "2.4+git${SRCPV}" SRC_URI += " \ ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ + file://0001-Fix-examples-build-error.patch \ " SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" -- cgit v1.2.3-54-g00ecf From 1716c294770b10e41af1b11cbe820ca857168556 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 31 Jul 2019 13:33:09 +0300 Subject: qt5: update to Qt 5.13.1 Change-Id: I1581770fa88763654b62bd7054c889852138ef65 Reviewed-by: Kari Hormi --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- .../qtbase/0013-Disable-ltcg-for-host_build.patch | 12 +++++--- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- ...d-error-if-qtquickcompiler-is-used-in-non.patch | 36 ++++++++++++++++++++++ recipes-qt/qt5/qtdeclarative_git.bb | 4 ++- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtlottie_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools/run-ptest | 1 - recipes-qt/qt5/qttools_git.bb | 3 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 +-- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 40 files changed, 83 insertions(+), 45 deletions(-) create mode 100644 recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ae1cc441..739c12bf 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" +SRCREV = "28af6e97e5fe7f844bc85df7af22ce8b7414f5a6" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 25681f53..c470e90d 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "7640c5d526d10e0397e9f2e712139433165d269f" +SRCREV = "7e60b6d599db9d4b18db3fe050d9f53ccb3125c1" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 492b1350..a2c3691c 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.13.0+git${SRCPV}" +PV = "5.13.1+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 663924dc..d917595a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" +SRCREV = "28af6e97e5fe7f844bc85df7af22ce8b7414f5a6" diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index e275a80e..e0591d2a 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch @@ -1,4 +1,4 @@ -From ffd62d10df5607897ef366330e368069fed1a9b9 Mon Sep 17 00:00:00 2001 +From a080cb3ac2ad24aeb73407c772ed560dc4cb7ef5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Oct 2018 09:54:57 +0300 Subject: [PATCH] Disable ltcg for host_build @@ -15,12 +15,14 @@ Upstream-Status: Inappropriate [embedded specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf -index ccf0226272..482e5b573d 100644 +index a94f6d0eeb..3cb01c334d 100644 --- a/mkspecs/features/ltcg.prf +++ b/mkspecs/features/ltcg.prf -@@ -1,4 +1,4 @@ --CONFIG(release, debug|release) { -+CONFIG(release, debug|release):!host_build { +@@ -1,6 +1,6 @@ + static:no-static-ltcg { + # Static library but no-static-ltcg enabled: skip LTCG +-} else: CONFIG(release, debug|release) { ++} else: CONFIG(release, debug|release):!host_build { # We need fat object files when creating static libraries on some platforms # so the linker will know to load a particular object from the library # in the first place. On others, we have special ar and nm to create the symbol diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 077cc651..5e4a89b2 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" +SRCREV = "28af6e97e5fe7f844bc85df7af22ce8b7414f5a6" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index b289914b..23c2d008 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "7c50ad366e8e40996a3b75a31b9834f6f667bde6" +SRCREV = "aa765c1b7802746e6a97043b62a142eb2d2137af" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 5379d09f..3174aaf7 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8f2d6640f959e35a8fd033a50aa57cb13b673cbb" +SRCREV = "96dd4e7ff0b10ac79798f1ae63db716bcc199e87" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 78de05b3..0165fc15 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "cc7f4769a02421575c9f5a61d9b3687af79201dd" +SRCREV = "3206729aa704d9c7cdfaa734f177334d5c11ae72" diff --git a/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch new file mode 100644 index 00000000..d2bac1f7 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch @@ -0,0 +1,36 @@ +From 5ae643e2ab69892e0dbe296cf14e020c7938ebee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= +Date: Fri, 2 Aug 2019 11:03:06 +0000 +Subject: [PATCH] Revert "Yield error if qtquickcompiler is used in non-QML + projects" + +This reverts commit c5578b16d6454e708c8ce12661a85d41eeaaa758, because +it prevents enabling the qtquickcompiler feature globally. + +Fixes: QTBUG-77277 +Change-Id: Ic80835c462570a67ae3105bb3d1b6452800d2c94 +Reviewed-by: Kai Koehne +--- + tools/qmlcachegen/qtquickcompiler.prf | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf +index 967d55a5b..b98d8a019 100644 +--- a/tools/qmlcachegen/qtquickcompiler.prf ++++ b/tools/qmlcachegen/qtquickcompiler.prf +@@ -1,15 +1,5 @@ + if(qtc_run|lupdate_run): return() + +-!contains(QT, qml) { +- qt_modules = \ +- $$replace(QT, -private$, _private) \ +- $$replace(QT_PRIVATE, -private$, _private) +- qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends") +- !contains(qt_modules, qml): \ +- error("The qtquickcompiler feature cannot be used without the QML module.") +- unset(qt_modules) +-} +- + qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER) + qtPrepareTool(QMAKE_RCC, rcc, _DEP) + diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 9d06377d..63146214 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" +SRC_URI += "file://0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch" + PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" @@ -24,6 +26,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "ecc092fa5519e77a47ef560f0137b4cd5f417c5e" +SRCREV = "aeec2f94c376c9a0e84bbbb3be4652384c7da113" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index a130c86e..53381547 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "7d610c6b1a437235cba38848c1af9afd5556dc73" +SRCREV = "027a1dfd3eca382dab3f3f17e7f43ccb84e329be" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 973a2b7a..32c1dc20 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "417dff666bd5a9e5a09b67780b0ffa8a496cbe92" +SRCREV = "3b3b3f85ddd472bdae168f210e62dc2868997aae" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d1905873..e5154951 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a743e1427b4ce9b4f1c43d3456679c09cee7b4e0" +SRCREV = "adc70a5244a8a7c3d554cbcfc3f38f8396974900" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index eae03ae1..62c76b06 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "667af08a388ffc3441adc5b8e73f2f8797b274c5" +SRCREV_qtlocation = "46ae4e4db687b8a12e639d9b248546652b680c04" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 541ca55f..9291d472 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "553ec1bc799f344a12e34c91720e13a469d85365" +SRCREV = "4c3207a7385a3ba402884bb50136bbe7b70baa2e" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index b24f2a4c..471b8df7 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047" +SRCREV = "dbdcc1b099dc25ffb707a2441191463de33c51f3" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index a63a29e8..437b6ee9 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab" +SRCREV = "c2bf9b420f29e4b001d6f85b918be5fb89c87564" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 846e6eda..db098761 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "d7b00a49803412caf6a0b415974ff2f4c3adf7f7" +SRCREV = "a0f911a29eb055de1e9dc2d3e78a1f03ccead5da" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 73f9c3d7..bdb93602 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "ea80013b2e990c8c28a9dfe7d6afaaa250bf2402" +SRCREV = "200b47519ffc61ebd06cda9a4c452d7b15e37d33" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index a5228fbd..ec3e7991 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "5f7e823d67e615727c8e36aafc6baadfc105c67f" +SRCREV = "845cd17a498d6008992b04ec4ca1984e6e73de3c" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 5e6d6bdc..c7cf976c 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e7b07a60408285128dedb373316801294ca941b0" +SRCREV = "6ccba37dedcb37507fd1ab3c72e576c0b005e572" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 4789cade..259f32e0 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "9401306e2db3a1756aab958d0939d12c8d5f46e0" +SRCREV = "912346548c774cdcc4383cc30e06f106dbf77a97" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 1b0e51e7..1a10d573 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "cb8388ac1de37ff31786cd1bd4723938b76d0f0a" +SRCREV = "1323d465b4698296533cf6c73ea5ace65dd0ce94" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index aad757cc..5f16351f 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "ce508999540cb125dad40dd250b17e6ad20d542b" +SRCREV = "6390e165dc2df3bc48c3655ed45d1b952d1f2bae" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 1d48f5b0..b8be30bb 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "b18c452fdbe09c54caacb4323dea65b3746485e5" +SRCREV = "5d82bf36c526d55951127c95d8c0aa5abc2e199d" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 648460db..9032d23e 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "2f2b747ebc4dd982caede82a0a931ad73e4cd462" +SRCREV = "335f1d02dc134bf11277c0573553c7c838cc6a9f" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index e7d8872d..3a42b366 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "3a4c634241f7271ddfbb840a42d6bf863b46ccea" +SRCREV = "1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8" diff --git a/recipes-qt/qt5/qttools/run-ptest b/recipes-qt/qt5/qttools/run-ptest index 5cd5e27e..ae671a72 100644 --- a/recipes-qt/qt5/qttools/run-ptest +++ b/recipes-qt/qt5/qttools/run-ptest @@ -1,4 +1,3 @@ #!/bin/sh ./tst_qtdiag -./tst_qtattributionsscanner diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e33d17d2..38256a7f 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "cc9250477eaa71a3f3ffd050591d4a9d835288ca" +SRCREV = "6d19911c0db508a1c0079890a0adc8f6ab87bcf7" BBCLASSEXTEND = "native nativesdk" @@ -40,5 +40,4 @@ do_install_ptest() { mkdir -p ${D}${PTEST_PATH} t=${D}${PTEST_PATH} cp ${B}/tests/auto/qtdiag/tst_tdiag $t - cp ${B}/tests/auto/qtattributionsscanner/tst_qtattributionsscanner $t } diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index bbaee2ef..6f6fd291 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "88266670663256f40019e7163092e17401557d5f" +SRCREV = "55b11294296a7bbc3a3bdfe9d2f5b381abf01d92" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 21ca0590..b8026230 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "2413bc23c5f9995752fdd03d56e480d661fc6fbc" +SRCREV = "6143eec2525af08e6aab895bcf64c2745a427f13" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cfcfad8e..3431dd9e 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "79037e46eeb00e20c5f3bbe7d0de4b702af86884" +SRCREV = "f4636b934f90b2a07b09f1925a86440cf1944d08" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index b468ecb1..846f0507 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "fdba7f6e285d35757190d99f9880e3bd0380e254" +SRCREV = "c5d4f9b1a653a242b6231cbdea8ccfc751180beb" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index a281cba2..8447e926 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -172,8 +172,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "5d4bac57a0191287a2fc345f6b398fb1f5d08517" -SRCREV_chromium = "8a28c0bb19fc8627812cb7c3154408b71ff2bf5e" +SRCREV_qtwebengine = "fa555f40bca60e82194bef22915bf7c545082c0e" +SRCREV_chromium = "8096caad7098cb949899abb6a231d28349c7e409" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index b5760229..239060ac 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "15637e6d824bca5d149147207a98cbc016fbbef6" +SRCREV = "95957bbecc40e5efb163ab123c2a7d8d04005bef" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 11144537..55b165f9 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "b7d892b97697f90b3669dab56358a48fb3542f68" +SRCREV = "0634c8104558dbb7acd314d52cf4b039c8c3689d" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index dc2a3e4b..ea219ac1 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "3265fa961a27894faa5b3413fb39c8682266a72f" +SRCREV = "5c80bba07d09f498027586a32b0f937d26cca1dd" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 31c5b671..c0bb2e3f 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "7e86e23ee87f2450b3f7103632c3ad2ab082e5eb" +SRCREV = "d6090610969cd7f2f5554e6239b0e35f8755196a" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 73631fcd..5bf1c6ce 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "29891df4ce099542635e33891945ba19f3e9572c" +SRCREV = "84e44bf5a9e5dcb0f93c55129f565e34edb7dd1a" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From c1deb9aafe5fe20de1175944ed863e6d94dad71b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 5 Aug 2019 14:49:27 +0300 Subject: ogl-runtime: Fix format-security issues Fix build errors. error: format not a string literal and no format arguments [-Werror=format-security] | QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName()).critical(__VA_ARGS__) Change-Id: Id0c0e503d6927142d7653c16eca2251cd4689b8f Reviewed-by: Mikko Gronoff --- .../0002-Fix-format-security-issues.patch | 75 ++++++++++++++++++++++ recipes-qt/qt5/ogl-runtime_git.bb | 1 + 2 files changed, 76 insertions(+) create mode 100644 recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch new file mode 100644 index 00000000..fcf6915d --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch @@ -0,0 +1,75 @@ +From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 5 Aug 2019 14:24:44 +0300 +Subject: [PATCH] Fix format-security issues + +format not a string literal and no format arguments [-Wformat-security] + +Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7 +--- + src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 ++-- + src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp +index ac5b992..02046ac 100644 +--- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp ++++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp +@@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s + // check for error + GLenum error = m_glFunctions->glGetError(); + if (error != GL_NO_ERROR) { +- qCCritical(GL_ERROR, GLConversion::processGLError(error)); ++ qCCritical(GL_ERROR) << GLConversion::processGLError(error); + QT3DS_ASSERT(false); + GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID)); + bufID = 0; +@@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj + // check for error + GLenum error = m_glFunctions->glGetError(); + if (error != GL_NO_ERROR) { +- qCCritical(GL_ERROR, GLConversion::processGLError(error)); ++ qCCritical(GL_ERROR) << GLConversion::processGLError(error); + QT3DS_ASSERT(false); + success = false; + } +diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp +index 0fe6e0f..5dfe9d1 100644 +--- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp ++++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp +@@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla + } else { + GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID)); + bufID = 0; +- qCCritical(GL_ERROR, GLConversion::processGLError(target)); ++ qCCritical(GL_ERROR) << GLConversion::processGLError(target); + } + } + +@@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor + // check for error + GLenum error = m_glFunctions->glGetError(); + if (error != GL_NO_ERROR) { +- qCCritical(GL_ERROR, GLConversion::processGLError(error)); ++ qCCritical(GL_ERROR) << GLConversion::processGLError(error); + QT3DS_ASSERT(false); + GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID)); + bufID = 0; +@@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject + // check for error + GLenum error = m_glFunctions->glGetError(); + if (error != GL_NO_ERROR) { +- qCCritical(GL_ERROR, GLConversion::processGLError(error)); ++ qCCritical(GL_ERROR) << GLConversion::processGLError(error); + QT3DS_ASSERT(false); + success = false; + } +@@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRefglGetError(); + if (binaryError != GL_NO_ERROR) { + shaderStatus = GL_FALSE; +- qCCritical(GL_ERROR, GLConversion::processGLError(binaryError)); ++ qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError); + } + } + diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index 7d31b2a8..ecc8ba2b 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -17,6 +17,7 @@ PV = "2.4+git${SRCPV}" SRC_URI += " \ ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ file://0001-Fix-examples-build-error.patch \ + file://0002-Fix-format-security-issues.patch \ " SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" -- cgit v1.2.3-54-g00ecf