diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-15 13:40:13 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-16 05:35:05 +0000 |
| commit | 6aa1a8026b65c85a2ea35361939b6401f950cc2e (patch) | |
| tree | 03afa5b13563f3ea8a275020b19d05b3a747df2c | |
| parent | e6bbbf6f225d4ae926342d4c2f49976641bea8c0 (diff) | |
| download | meta-qt5-6aa1a8026b65c85a2ea35361939b6401f950cc2e.tar.gz | |
qt5: update submodulesv5.12.0-beta2
Update to Qt 5.12.0 beta2
Task-number: QTBUG-70847
Change-Id: I7bd500d3eea8f16ec1f57abe02f6f90775231ce0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtimageformats_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtknx_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebglplugin_git.bb | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 880c13c8..e020ebe2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -208,4 +208,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 208 | do_generate_qt_environment_file[umask] = "022" | 208 | do_generate_qt_environment_file[umask] = "022" |
| 209 | addtask generate_qt_environment_file after do_install before do_package | 209 | addtask generate_qt_environment_file after do_install before do_package |
| 210 | 210 | ||
| 211 | SRCREV = "5c94130a6708a7f7b4631645e52abd8768a48b7b" | 211 | SRCREV = "473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 459750fa..0e05231a 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
| @@ -36,6 +36,6 @@ do_configure_prepend() { | |||
| 36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | SRCREV = "6c77dea4711b6a88e80e30db21d622808e5ef9b6" | 39 | SRCREV = "e549220a5daaedb13f167d6cde4a181666faec63" |
| 40 | 40 | ||
| 41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0803e612..f220d671 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -134,4 +134,4 @@ do_install() { | |||
| 134 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 134 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | SRCREV = "5c94130a6708a7f7b4631645e52abd8768a48b7b" | 137 | SRCREV = "473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2d699196..68c2c7d2 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -250,4 +250,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 250 | 250 | ||
| 251 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 251 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 252 | 252 | ||
| 253 | SRCREV = "5c94130a6708a7f7b4631645e52abd8768a48b7b" | 253 | SRCREV = "473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index f5cfe314..3e93fbe4 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}" | |||
| 19 | 19 | ||
| 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 21 | 21 | ||
| 22 | SRCREV = "35a97ca4b43b4dc481b907d37204613460b07bbd" | 22 | SRCREV = "c9ed3c49e3884ffad899d7ae28b2480691824228" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f265494b..579be84f 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -33,6 +33,6 @@ do_install_append_class-nativesdk() { | |||
| 33 | 33 | ||
| 34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
| 35 | 35 | ||
| 36 | SRCREV = "7cd9447e14159be90a5fdb927a4a3ed2cbff50b2" | 36 | SRCREV = "41e15cb21c2f8924eee56aacc4ba8aace950cae5" |
| 37 | 37 | ||
| 38 | BBCLASSEXTEND =+ "native nativesdk" | 38 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index b7333f3d..75391148 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" | |||
| 25 | 25 | ||
| 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 27 | 27 | ||
| 28 | SRCREV = "ceebd297c3e4365940469347208e5f22b764d6a3" | 28 | SRCREV = "3e081dbc87eb3872197f56ddea8f55edf9c8aa3b" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 6b462e60..13351072 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
| @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 9 | 9 | ||
| 10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
| 11 | 11 | ||
| 12 | SRCREV = "c15c3325628335ba4af0568155740822380bc574" | 12 | SRCREV = "fff1beb979053dbd2649757fd2a0b806487014b4" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 6d208b58..c6c564c4 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
| @@ -31,7 +31,7 @@ SRC_URI += " \ | |||
| 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
| 32 | " | 32 | " |
| 33 | 33 | ||
| 34 | SRCREV_qtlocation = "8b702b66aa09d6e59da1c99af353eac36cff01e4" | 34 | SRCREV_qtlocation = "0cdf4748dd40ec2e0df20eda4a63e8e070d2b790" |
| 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
| 36 | 36 | ||
| 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 6367759c..71499bd0 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
| 12 | 12 | ||
| 13 | SRCREV = "1a06f3fb42754078f816ff8c6a0ab8cfd7b7a24e" | 13 | SRCREV = "9a9ac65defef1b42888ad19ba0aa38f1fe2b239e" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 48778185..80f4f2f6 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
| 12 | 12 | ||
| 13 | SRCREV = "fba7e3cf5c8ad287ceaaeb381989159d8baa96ec" | 13 | SRCREV = "700b5d89a1040faba1145999e64ce31e37d5b782" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index e1528866..85ca43f7 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" | |||
| 24 | 24 | ||
| 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 26 | 26 | ||
| 27 | SRCREV = "0ebd459bf781ff22a4a0aac460c230874cc0fe52" | 27 | SRCREV = "09a6746ec6d2a21415f8e0b0a8817510f1b8b2e9" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index ebed3e08..4a845a8b 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
| 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
| 33 | " | 33 | " |
| 34 | 34 | ||
| 35 | SRCREV = "1251d22560474bd5272ed31923bd42122a39f9ae" | 35 | SRCREV = "b29d3f5b5b189297e0412f832111a91ae40fad42" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
| 38 | 38 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 9526069c..3536f2c0 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" | |||
| 49 | 49 | ||
| 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
| 51 | 51 | ||
| 52 | SRCREV = "6bcc33aea90d5d725a08b51eda7374a50408ee07" | 52 | SRCREV = "8f8816668694c6eeba5ccf017d94c14dad946f02" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 85943b0f..98aa0ce0 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -172,7 +172,7 @@ SRC_URI_append_libc-musl = "\ | |||
| 172 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
| 173 | " | 173 | " |
| 174 | 174 | ||
| 175 | SRCREV_qtwebengine = "8b0f6b343dd807236001cacbae9bacb7e4923369" | 175 | SRCREV_qtwebengine = "75f6f4d3178d9356aff9a5a14f8601ebc8b70c95" |
| 176 | SRCREV_chromium = "3f8994c671d1cfc674ab64e118304b897a84762c" | 176 | SRCREV_chromium = "3f8994c671d1cfc674ab64e118304b897a84762c" |
| 177 | SRCREV = "${SRCREV_qtwebengine}" | 177 | SRCREV = "${SRCREV_qtwebengine}" |
| 178 | 178 | ||
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 17742b1e..64e54b4d 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
| @@ -18,4 +18,4 @@ do_configure_prepend() { | |||
| 18 | 18 | ||
| 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
| 20 | 20 | ||
| 21 | SRCREV = "36d9bcc2cf1f26afe7e336b13ce59aae54e3cec8" | 21 | SRCREV = "e14f45692d5a0ffc15bfd3b85e4fd31d7e578d31" |
