49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
diff -uNr qt-everywhere-src-5.11.3/qtbase/src/corelib/io/qfilesystemengine_unix.cpp qt-everywhere-src-5.11.3.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
|
|
--- qt-everywhere-src-5.11.3/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-11-25 14:51:11.000000000 +0200
|
|
+++ qt-everywhere-src-5.11.3.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2019-07-19 18:45:35.433356132 +0300
|
|
@@ -97,7 +97,7 @@
|
|
#endif
|
|
#endif
|
|
|
|
-#if defined(Q_OS_ANDROID)
|
|
+#if defined(Q_OS_ANDROID) || defined(__ANDROID__)
|
|
// statx() is disabled on Android because quite a few systems
|
|
// come with sandboxes that kill applications that make system calls outside a
|
|
// whitelist and several Android vendors can't be bothered to update the list.
|
|
@@ -111,7 +111,7 @@
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
enum {
|
|
-#ifdef Q_OS_ANDROID
|
|
+#if defined(Q_OS_ANDROID) || defined(__ANDROID__)
|
|
// On Android, the link(2) system call has been observed to always fail
|
|
// with EACCES, regardless of whether there are permission problems or not.
|
|
SupportsHardlinking = false
|
|
@@ -692,7 +692,7 @@
|
|
if (entry.isRoot())
|
|
return entry;
|
|
|
|
-#if !defined(Q_OS_MAC) && !defined(Q_OS_QNX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) && _POSIX_VERSION < 200809L
|
|
+#if !defined(Q_OS_MAC) && !defined(Q_OS_QNX) && !defined(Q_OS_ANDROID) && !defined(__ANDROID__) && !defined(Q_OS_HAIKU) && _POSIX_VERSION < 200809L
|
|
// realpath(X,0) is not supported
|
|
Q_UNUSED(data);
|
|
return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));
|
|
@@ -706,7 +706,7 @@
|
|
errno = savedErrno;
|
|
ret = 0;
|
|
}
|
|
-# elif defined(Q_OS_ANDROID)
|
|
+# elif defined(Q_OS_ANDROID) || defined(__ANDROID__)
|
|
// On some Android versions, realpath() will return a path even if it does not exist
|
|
// To work around this, we check existence in advance.
|
|
if (!data.hasFlags(QFileSystemMetaData::ExistsAttribute))
|
|
@@ -856,7 +856,7 @@
|
|
|
|
#if !defined(Q_OS_INTEGRITY)
|
|
struct group *gr = 0;
|
|
-#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID) && (__ANDROID_API__ >= 24))
|
|
+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) && (!defined(Q_OS_ANDROID) || !defined(__ANDROID__) || defined(Q_OS_ANDROID) && (__ANDROID_API__ >= 24))
|
|
size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
|
|
if (size_max == -1)
|
|
size_max = 1024;
|