diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch | 13 |
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 6d480105..2393673f 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 @@ -27,7 +27,7 @@ diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qcon index 10458e41d7..8cfa40e461 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -100,14 +100,14 @@ +@@ -104,7 +104,7 @@ #define QT_FEATURE_process -1 #define QT_FEATURE_regularexpression -1 #ifdef __GLIBC_PREREQ @@ -36,7 +36,8 @@ index 10458e41d7..8cfa40e461 100644 #else # define QT_FEATURE_renameat2 -1 #endif - #define QT_FEATURE_sharedmemory -1 +@@ -112,7 +112,7 @@ + #define QT_FEATURE_signaling_nan -1 #define QT_FEATURE_slog2 -1 #ifdef __GLIBC_PREREQ -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) @@ -45,12 +46,12 @@ index 10458e41d7..8cfa40e461 100644 # define QT_FEATURE_statx -1 #endif diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index b78e037865..9574d1a044 100644 +index c3abec8..6229c61 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -1232,16 +1232,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy - if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) - return emptyFileEntryWarning(), false; +@@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy + Q_CHECK_FILE_NAME(srcPath, false); + Q_CHECK_FILE_NAME(tgtPath, false); -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) |