summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-10-23 12:59:04 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-10-24 06:12:12 +0000
commit11b63656bad9db24950d05901a8b1917bc5cb7f8 (patch)
treeb9da76875245964d18c7f113c866c0ebd2e974b4
parent000ffe6066219e749c95269dd72edb9b662d4b63 (diff)
downloadmeta-qt5-11b63656bad9db24950d05901a8b1917bc5cb7f8.tar.gz
qt5: update submodulesv5.12.0-beta3
Update to Qt 5.12.0 beta3 Task-number: QTBUG-70847 Change-Id: I7b9e0eb94a4d2d982002556ff9485147171612d0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch16
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb2
7 files changed, 14 insertions, 14 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 01fa84fa..15e8343b 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() {
193do_generate_qt_environment_file[umask] = "022" 193do_generate_qt_environment_file[umask] = "022"
194addtask generate_qt_environment_file after do_install before do_package 194addtask generate_qt_environment_file after do_install before do_package
195 195
196SRCREV = "b88eaa255a4646446e0842f3d8f732b39d09a65f" 196SRCREV = "c6c31b14a73674459eb5e762bb7487900b8c4b36"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 67dfc27d..993125b2 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -135,4 +135,4 @@ do_install() {
135 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 135 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
136} 136}
137 137
138SRCREV = "b88eaa255a4646446e0842f3d8f732b39d09a65f" 138SRCREV = "c6c31b14a73674459eb5e762bb7487900b8c4b36"
diff --git a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
index 0f1e1b30..a942e06a 100644
--- a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
+++ b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
@@ -1,4 +1,4 @@
1From f63242fbcac990839eff2ce9f970377d6350fd8a Mon Sep 17 00:00:00 2001 1From ca1e8d402703351fd71560f8a5e94ae9304edb85 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Tue, 21 Aug 2018 00:29:06 +0200 3Date: Tue, 21 Aug 2018 00:29:06 +0200
4Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped 4Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped
@@ -15,13 +15,14 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
15 1 file changed, 11 insertions(+) 15 1 file changed, 11 insertions(+)
16 16
17diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp 17diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
18index deb4a9f220..ecf23168e7 100644 18index 5a5a3a8..e5469ff 100644
19--- a/src/corelib/io/qfilesystemengine_unix.cpp 19--- a/src/corelib/io/qfilesystemengine_unix.cpp
20+++ b/src/corelib/io/qfilesystemengine_unix.cpp 20+++ b/src/corelib/io/qfilesystemengine_unix.cpp
21@@ -97,6 +97,17 @@ extern "C" NSString *NSTemporaryDirectory(); 21@@ -93,6 +93,17 @@ extern "C" NSString *NSTemporaryDirectory();
22 #ifndef FICLONE
22 # define FICLONE _IOW(0x94, 9, int) 23 # define FICLONE _IOW(0x94, 9, int)
23 #endif 24 #endif
24 25+
25+// renameat2/statx features for non bootstrapped build 26+// renameat2/statx features for non bootstrapped build
26+#ifndef QT_BOOTSTRAPPED 27+#ifndef QT_BOOTSTRAPPED
27+#ifdef __GLIBC_PREREQ 28+#ifdef __GLIBC_PREREQ
@@ -32,7 +33,6 @@ index deb4a9f220..ecf23168e7 100644
32+# define QT_FEATURE_statx -1 33+# define QT_FEATURE_statx -1
33+#endif 34+#endif
34+#endif 35+#endif
35+ 36 #endif
36 # if defined(Q_OS_ANDROID) 37
37 // renameat2() and statx() are disabled on Android because quite a few systems 38 #if defined(Q_OS_ANDROID)
38 // come with sandboxes that kill applications that make system calls outside a
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index b563684b..9fc76662 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -251,4 +251,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
251 251
252RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 252RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
253 253
254SRCREV = "b88eaa255a4646446e0842f3d8f732b39d09a65f" 254SRCREV = "c6c31b14a73674459eb5e762bb7487900b8c4b36"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 66494d29..f0720273 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
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "a3aa995332c3afdba6e56527263363ac593f6f58" 22SRCREV = "26840646bb0e1b82bb6608395ba6041538ced3ab"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index db416497..3a13450c 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
34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
35 35
36SRCREV = "878a17729b4cdaf0a7989d3e5fe22b058c1715d4" 36SRCREV = "6734ee9a6ddb6a3870556514a70d904836258559"
37 37
38BBCLASSEXTEND =+ "native nativesdk" 38BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index ba7ca25f..de606923 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -173,7 +173,7 @@ SRC_URI_append_libc-musl = "\
173 file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ 173 file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \
174" 174"
175 175
176SRCREV_qtwebengine = "404201b9a41564512937a7d96e55d6b095bdcab0" 176SRCREV_qtwebengine = "e77ed6f1686dab1852106d2ffa5f74e7526dbce9"
177SRCREV_chromium = "156c2b70ceef9a4464a5a241c9f816dea4fd3168" 177SRCREV_chromium = "156c2b70ceef9a4464a5a241c9f816dea4fd3168"
178SRCREV = "${SRCREV_qtwebengine}" 178SRCREV = "${SRCREV_qtwebengine}"
179 179