summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-10-01 13:00:25 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-10-07 17:33:45 +0300
commitc8a3fd4b856e6f71d4811da2a0514c7656687c35 (patch)
treefcc007593d7c38eaa2beac9c4cc6f7e8eefaa599 /recipes-qt/qt5/qtbase
parentde935868de34d5ab8c34edf7eded74499d6c3798 (diff)
downloadmeta-qt5-c8a3fd4b856e6f71d4811da2a0514c7656687c35.tar.gz
qt5: update submodulesv5.14.0-beta1
Update to latest content in Qt 5.14 branch. Task-number: QTBUG-77876 Change-Id: I06f789e0503baf0b89d63b76af0f45ea60af412b Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
index b3c2c767..2d644230 100644
--- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
+++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
@@ -1,4 +1,4 @@
1From 0c79a6761e75441f433fd397bc3b79e78b6c5ef8 Mon Sep 17 00:00:00 2001 1From 33edd09ffb4acaf9b829a31a567508ea251db7ab 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: Sun, 14 Apr 2019 13:27:58 +0200 3Date: Sun, 14 Apr 2019 13:27:58 +0200
4Subject: [PATCH] Avoid renameeat2 for native(sdk) builds 4Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
@@ -24,10 +24,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
24 2 files changed, 2 insertions(+), 12 deletions(-) 24 2 files changed, 2 insertions(+), 12 deletions(-)
25 25
26diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h 26diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
27index dfcc3c9c7f..30166fe41c 100644 27index e6ad805..283ce1c 100644
28--- a/src/corelib/global/qconfig-bootstrapped.h 28--- a/src/corelib/global/qconfig-bootstrapped.h
29+++ b/src/corelib/global/qconfig-bootstrapped.h 29+++ b/src/corelib/global/qconfig-bootstrapped.h
30@@ -100,14 +100,14 @@ 30@@ -104,7 +104,7 @@
31 #define QT_FEATURE_process -1 31 #define QT_FEATURE_process -1
32 #define QT_FEATURE_regularexpression -1 32 #define QT_FEATURE_regularexpression -1
33 #ifdef __GLIBC_PREREQ 33 #ifdef __GLIBC_PREREQ
@@ -36,7 +36,8 @@ index dfcc3c9c7f..30166fe41c 100644
36 #else 36 #else
37 # define QT_FEATURE_renameat2 -1 37 # define QT_FEATURE_renameat2 -1
38 #endif 38 #endif
39 #define QT_FEATURE_sharedmemory -1 39@@ -112,7 +112,7 @@
40 #define QT_FEATURE_signaling_nan -1
40 #define QT_FEATURE_slog2 -1 41 #define QT_FEATURE_slog2 -1
41 #ifdef __GLIBC_PREREQ 42 #ifdef __GLIBC_PREREQ
42-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) 43-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
@@ -45,10 +46,10 @@ index dfcc3c9c7f..30166fe41c 100644
45 # define QT_FEATURE_statx -1 46 # define QT_FEATURE_statx -1
46 #endif 47 #endif
47diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp 48diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
48index b2d81066db..d1783ebdf3 100644 49index 74865fe..2b787ee 100644
49--- a/src/corelib/io/qfilesystemengine_unix.cpp 50--- a/src/corelib/io/qfilesystemengine_unix.cpp
50+++ b/src/corelib/io/qfilesystemengine_unix.cpp 51+++ b/src/corelib/io/qfilesystemengine_unix.cpp
51@@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy 52@@ -1236,16 +1236,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
52 if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) 53 if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty()))
53 return emptyFileEntryWarning(), false; 54 return emptyFileEntryWarning(), false;
54 55