diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-10-17 07:59:25 -0700 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-18 05:30:34 +0000 |
| commit | 7f60940fbedef17984e283da41eae94f29fef428 (patch) | |
| tree | 7d66295137904b794e707e94f6d8c18fb479134f | |
| parent | 2624676b5731a9d93a1e46429d2c597f1e4bae38 (diff) | |
Re-disable statx() on Android
Commit b7887f9b4faad2227691a2af589e9d7680d6ae08 removed this explicit
disabling because it shouldn't be needed anymore. Turns out it was, as
new Android SDK do include modern Linux headers and those define the
structs and constants needed for statx().
Repeat of 8eb3944dac81b8c51d7bac7784204d457551b50c.
Task-number: QTBUG-64490
Fixes: QTBUG-71200
Change-Id: If7e743cf8476463880ccfffd155e6d5c2b5a3da9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 40e8f82a80..964dcebeb2 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -97,6 +97,13 @@ extern "C" NSString *NSTemporaryDirectory(); #endif #endif +#if defined(Q_OS_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. +# undef STATX_BASIC_STATS +#endif + #ifndef STATX_ALL struct statx { mode_t stx_mode; }; // dummy #endif |