diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-29 14:02:31 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-01 15:58:53 +0200 |
| commit | 19ceaa67b564c202b612bbf126ce1606d9b94cc0 (patch) | |
| tree | 77eb2fd624a3ca59c44760866f69da87856be263 /recipes-qt/qt5/qtbase | |
| parent | ec860bdcdb8c4b64f9b4d73b0e1723bd18bd1112 (diff) | |
| download | meta-qt5-19ceaa67b564c202b612bbf126ce1606d9b94cc0.tar.gz | |
qt5: update submodules
Update to latest content in Qt 5.14.0 branch.
ptest block removed from qttools_git.bb as
qttools commit ec310d3d4e573aaed1e273f1e247f1bdc0c64d5c
disabled qtdiag tests.
Task-number: QTBUG-77876
Change-Id: Ica6ed568063056b81b8453592a91a88cd6093d51
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.patch | 10 |
1 files changed, 5 insertions, 5 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 2d644230..02dd1b7d 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 @@ | |||
| 1 | From 33edd09ffb4acaf9b829a31a567508ea251db7ab Mon Sep 17 00:00:00 2001 | 1 | From 6f421e75a67f582045325d5408719d805c59a14e Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Sun, 14 Apr 2019 13:27:58 +0200 | 3 | Date: Sun, 14 Apr 2019 13:27:58 +0200 |
| 4 | Subject: [PATCH] Avoid renameeat2 for native(sdk) builds | 4 | Subject: [PATCH] Avoid renameeat2 for native(sdk) builds |
| @@ -46,12 +46,12 @@ index e6ad805..283ce1c 100644 | |||
| 46 | # define QT_FEATURE_statx -1 | 46 | # define QT_FEATURE_statx -1 |
| 47 | #endif | 47 | #endif |
| 48 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | 48 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp |
| 49 | index 74865fe..2b787ee 100644 | 49 | index c3abec8..6229c61 100644 |
| 50 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | 50 | --- a/src/corelib/io/qfilesystemengine_unix.cpp |
| 51 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | 51 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp |
| 52 | @@ -1236,16 +1236,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy | 52 | @@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy |
| 53 | if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) | 53 | Q_CHECK_FILE_NAME(srcPath, false); |
| 54 | return emptyFileEntryWarning(), false; | 54 | Q_CHECK_FILE_NAME(tgtPath, false); |
| 55 | 55 | ||
| 56 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) | 56 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) |
| 57 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) | 57 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) |