summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
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 /recipes-qt/qt5/qtbase
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch16
1 files changed, 8 insertions, 8 deletions
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