diff options
| author | Bernd Weimer <bweimer@blackberry.com> | 2014-04-15 11:44:05 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-22 07:09:06 (GMT) |
| commit | b952502b2af4c8760f7753d7eeadbd82e4290453 (patch) | |
| tree | 4c72b9666a084994b2e74063595cfc3780355d43 /mkspecs | |
| parent | bb8f570beaba5feddb09b1ff10a380ed8cc7f427 (diff) | |
| download | Qt-b952502b2af4c8760f7753d7eeadbd82e4290453.zip Qt-b952502b2af4c8760f7753d7eeadbd82e4290453.tar.gz Qt-b952502b2af4c8760f7753d7eeadbd82e4290453.tar.bz2 | |
QNX: Fix QDir::entryInfoList()
If D_FLAG_FILTER is set, duplicate name entries are filtered out, so
this flag has to be set along with D_FLAG_STAT in the call to dircntl.
Also releaved dependencies between defines__EXT_QNX__READDIR_R,
__EXT_QNX__READDIR64_R and _POSIX_THREAD_SAFE_FUNCTIONS
Back-ported from qtbase: aee59f06e0017e225363d4207d3d96c2b30698e1
Change-Id: Ifa2148cc49544076fcfe8fb88e2a0dfe2404959e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/qnx-armv7le-qcc/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/qnx-x86-qcc/qplatformdefs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/qnx-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h index 5ca27e1..7718612 100644 --- a/mkspecs/qnx-armv7le-qcc/qplatformdefs.h +++ b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h @@ -83,7 +83,7 @@ #include <arpa/inet.h> #define QT_USE_XOPEN_LFS_EXTENSIONS -#if !defined(__EXT_QNX__READDIR64_R) +#if defined(__EXT_QNX__READDIR_R) && !defined(__EXT_QNX__READDIR64_R) #define QT_NO_READDIR64 #endif #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/qnx-x86-qcc/qplatformdefs.h b/mkspecs/qnx-x86-qcc/qplatformdefs.h index 5ca27e1..7718612 100644 --- a/mkspecs/qnx-x86-qcc/qplatformdefs.h +++ b/mkspecs/qnx-x86-qcc/qplatformdefs.h @@ -83,7 +83,7 @@ #include <arpa/inet.h> #define QT_USE_XOPEN_LFS_EXTENSIONS -#if !defined(__EXT_QNX__READDIR64_R) +#if defined(__EXT_QNX__READDIR_R) && !defined(__EXT_QNX__READDIR64_R) #define QT_NO_READDIR64 #endif #include "../common/posix/qplatformdefs.h" |