From 039b0c6b9b94eb7601fa3b652e8b668d32251f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarno=20L=C3=A4ms=C3=A4?= Date: Wed, 6 Nov 2024 12:37:35 +0200 Subject: [PATCH] Don't support moving files to trash on VxWorks On VxWorks 24.03, the `AT_FDCWD` wasn't defined, which happened to branch to the correct branch. VxWorsk 24.09 TP does define the `AT_FDCWD`, which causes the preprocessor directives to branch to a branch where moving files to trash would be supported. In a sidenote, VxWorks doesn't define `renameat`, `O_DIRECTORY` nor `O_NOFOLLOW`. Task-number: QTBUG-130629 Pick-to: 6.8 Change-Id: I2b850813aeff6f925ab91932efd7aeb13f753f69 Reviewed-by: Thiago Macieira --- src/corelib/io/qfilesystemengine_unix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index bd63a6d65ea..4c4648e20ed 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -1242,7 +1242,7 @@ bool QFileSystemEngine::createLink(const QFileSystemEntry &source, const QFileSy #ifdef Q_OS_DARWIN // see qfilesystemengine_mac.mm -#elif defined(QT_BOOTSTRAPPED) || !defined(AT_FDCWD) || defined(Q_OS_ANDROID) || !QT_CONFIG(datestring) +#elif defined(QT_BOOTSTRAPPED) || !defined(AT_FDCWD) || defined(Q_OS_ANDROID) || !QT_CONFIG(datestring) || defined(Q_OS_VXWORKS) // bootstrapped tools don't need this, and we don't want QStorageInfo //static bool QFileSystemEngine::supportsMoveFileToTrash()