From 0010e434f6101edf47aadc6e58d27452570824ac Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 31 Aug 2017 09:07:58 +0300 Subject: qt5: update submodules Update submodules to Qt 5.9.2 (snapshot 3) Change-Id: I584ac7031ecd7eed5f63c87ee29227ccc1a94aab Reviewed-by: Kari Oikarinen Reviewed-by: Teemu Holappa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtenginio_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- .../qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch | 6 +++--- recipes-qt/qt5/qtlocation_git.bb | 4 ++-- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 096cceb8..5a7783c2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "8bebded9ab02b8eec67c44bfddf802d6bf9cda3c" +SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 5c28e251..cced9ca9 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -34,6 +34,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "aa16ae56f6a3f559e4d195717fbdb9c57c7579cd" +SRCREV = "595b4add0ce6f32bb8ffc56b3a59e6e5bf0b000a" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 11f0ffe3..60307e77 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -109,4 +109,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "8bebded9ab02b8eec67c44bfddf802d6bf9cda3c" +SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0af02519..7173221e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "8bebded9ab02b8eec67c44bfddf802d6bf9cda3c" +SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d3447efc..07715a60 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb" +SRCREV = "5261307d061a2b925faffb6ea21aa3dbca1e50a9" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 933578a7..9e91a1d4 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "687ec9eb370e9538264280b58bed4d3b1c889579" +SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 523f5e41..bc16fdfd 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "1b21b73e89942d567c90a17a3bf7a7ecae3de258" +SRCREV = "2c45bdb0e2433b2246d985b61348f8caa6e5926b" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 8b4fb714..7e0f1313 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb @@ -13,5 +13,5 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "dev" -SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" +SRCREV = "b0ad5907f480307853f7ac951bacfaa61dcbd94e" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 4c936a67..a771d9da 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 = "17c9df2e5945a06944d8e9d75d1cba25bc885ecb" +SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a" diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch index 5e452c03..5ed06f3b 100644 --- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch @@ -1,4 +1,4 @@ -From 632cfa131a890d42275873a7ca8cdf95ada61360 Mon Sep 17 00:00:00 2001 +From a7e5dcb12a7fad02206b89ba20a99726df7d6f4b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jun 2017 13:29:29 +0300 Subject: [PATCH] Make mapbox-gl build configurable @@ -13,7 +13,7 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro -index 459897a..d97e05d 100644 +index 07c3479..55d0040 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -6,7 +6,7 @@ qtConfig(concurrent) { @@ -22,6 +22,6 @@ index 459897a..d97e05d 100644 -qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { +mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { - !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { + !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) { warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") } else { diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 0aa55482..53597bb2 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -28,7 +28,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d" -SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" +SRCREV_qtlocation = "d22e6d09f1607e694694d2ae5b2f447605a8782e" +SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 7db1045f..44303462 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -29,4 +29,4 @@ SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "116cd7bdbd1e148aef05c27602780d65be335205" +SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 2f16a36f..cf8951ed 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -23,4 +23,4 @@ do_configure_prepend() { } QT_MODULE_BRANCH = "dev" -SRCREV = "695460401d9a89d2f156016d51601b2e59b64105" +SRCREV = "92c847e56d94c9032f3fa83922742e455233e4f3" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 7b624798..438e3086 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -24,4 +24,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3" +SRCREV = "633c5642611234cf204569471598c3d3c083b84c" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 55aa9c3e..0200f51f 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 = "8af8db3810ec2d8d2d923f39e23512d30ae234d9" +SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f" SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 40854e0b..93306035 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 = "0fcd0160662941a9ba800b36671e88d82790bd95" +SRCREV = "bdcd7a97449502f92069d36196cc81064b1c02a0" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index de3642ef..fd4d3bf1 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e" +SRCREV = "28b1b88a0b85f4ce7765ed5cc5f3780f97e5ea4f" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cb541904..491ea542 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81" +SRCREV = "a97b4f8504cd4bccebed60934e5b842610454b39" # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 0c5c8fca..0b559174 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -113,7 +113,7 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad" +SRCREV_qtwebengine = "0f6908b5f9eca09cf086410344a862b9d59ef727" SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9" SRCREV = "${SRCREV_qtwebengine}" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 3abee554..ed1440c1 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "bd2e0d1d87adfec3ba3fe8d9b5bd1c70c34c7a3e" +SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8" -- cgit v1.2.3-54-g00ecf