diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-01 12:12:43 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-01 13:17:52 +0000 |
| commit | afe5e7e6424037aee86f8a94971e968d9cbb9282 (patch) | |
| tree | a8999681ef3b781107999799d2887b4dc6658c71 | |
| parent | f2275de5433224cec21b0257437b612bfa889446 (diff) | |
| download | meta-qt5-afe5e7e6424037aee86f8a94971e968d9cbb9282.tar.gz | |
qt5: update submodules to 5.10.0 RC3v5.10.0
Change-Id: I9b94b012ac53db65aae076ff2618d435e74471f2
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/qtbase-native_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch | 25 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
6 files changed, 14 insertions, 21 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index f6056b91..9f3216a2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 197 | 197 | ||
| 198 | addtask generate_qt_environment_file after do_install before do_package | 198 | addtask generate_qt_environment_file after do_install before do_package |
| 199 | 199 | ||
| 200 | SRCREV = "984ad6124992c9831f57c2776aa2ed0a760149e6" | 200 | SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 944ba0b5..4c6b7015 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -131,4 +131,4 @@ do_install() { | |||
| 131 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 131 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | SRCREV = "984ad6124992c9831f57c2776aa2ed0a760149e6" | 134 | SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d9ba1a4c..161d5cef 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 228 | 228 | ||
| 229 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 229 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 230 | 230 | ||
| 231 | SRCREV = "984ad6124992c9831f57c2776aa2ed0a760149e6" | 231 | SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 001d80ad..facb4485 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { | |||
| 30 | 30 | ||
| 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
| 32 | 32 | ||
| 33 | SRCREV = "cc46992fbb94f1775ac22aa23b42d76f810a5913" | 33 | SRCREV = "dac71f3d6f6bc4f159f6107c792bc70cfe7c308e" |
| 34 | 34 | ||
| 35 | BBCLASSEXTEND =+ "native nativesdk" | 35 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch index 4a1a975f..3b24e064 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001 | 1 | From 5616656eb6d7423aaea107513209dac88c79d916 Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
| 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
| 4 | Subject: [PATCH] chromium: Force host toolchain configuration | 4 | Subject: [PATCH] chromium: Force host toolchain configuration |
| @@ -10,16 +10,16 @@ Upstream-Status: Inappropriate [OE specific] | |||
| 10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
| 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 12 | --- | 12 | --- |
| 13 | chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------ | 13 | chromium/tools/gn/bootstrap/bootstrap.py | 6 +++--- |
| 14 | 1 file changed, 6 insertions(+), 6 deletions(-) | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 15 | 15 | ||
| 16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py | 16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py |
| 17 | index 43d252b43e..e58347848e 100755 | 17 | index b1ff7e7..bccabbb 100755 |
| 18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py | 18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py |
| 19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py | 19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py |
| 20 | @@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options): | 20 | @@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 21 | ld = os.environ.get('LD', 'link.exe') | 21 | ld = os.environ.get('LD', cxx) |
| 22 | ar = os.environ.get('AR', 'lib.exe') | 22 | ar = os.environ.get('AR', 'ar -X64') |
| 23 | else: | 23 | else: |
| 24 | - cc = os.environ.get('CC', 'cc') | 24 | - cc = os.environ.get('CC', 'cc') |
| 25 | - cxx = os.environ.get('CXX', 'c++') | 25 | - cxx = os.environ.get('CXX', 'c++') |
| @@ -29,12 +29,5 @@ index 43d252b43e..e58347848e 100755 | |||
| 29 | - ar = os.environ.get('AR', 'ar') | 29 | - ar = os.environ.get('AR', 'ar') |
| 30 | + ar = os.environ.get('AR_host', 'ar') | 30 | + ar = os.environ.get('AR_host', 'ar') |
| 31 | 31 | ||
| 32 | - cflags = os.environ.get('CFLAGS', '').split() | 32 | # QTBUG-64759 |
| 33 | - cflags_cc = os.environ.get('CXXFLAGS', '').split() | 33 | # cflags = os.environ.get('CFLAGS', '').split() |
| 34 | - ldflags = os.environ.get('LDFLAGS', '').split() | ||
| 35 | + cflags = os.environ.get('CFLAGS_host', '').split() | ||
| 36 | + cflags_cc = os.environ.get('CXXFLAGS_host', '').split() | ||
| 37 | + ldflags = os.environ.get('LDFLAGS_host', '').split() | ||
| 38 | include_dirs = [root_gen_dir, SRC_ROOT] | ||
| 39 | libs = [] | ||
| 40 | |||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 2bb52535..38e97b15 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -155,7 +155,7 @@ SRC_URI_append_libc-musl = "\ | |||
| 155 | " | 155 | " |
| 156 | 156 | ||
| 157 | SRCREV_qtwebengine = "efa6d3f0d3a01753dd40823ce119e7d4f9765c8e" | 157 | SRCREV_qtwebengine = "efa6d3f0d3a01753dd40823ce119e7d4f9765c8e" |
| 158 | SRCREV_chromium = "2366767e6c6f333ef090667aa6838d6781725a78" | 158 | SRCREV_chromium = "e36dcec23b79a52fd7794ed2fad49bbf65a8146b" |
| 159 | SRCREV = "${SRCREV_qtwebengine}" | 159 | SRCREV = "${SRCREV_qtwebengine}" |
| 160 | 160 | ||
| 161 | SRCREV_FORMAT = "qtwebengine_chromium" | 161 | SRCREV_FORMAT = "qtwebengine_chromium" |
