diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 15:19:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 15:19:46 (GMT) |
| commit | e09de4df3ab7f57c107a1b14b80dec5728292b05 (patch) | |
| tree | 3be262311cfbaabcf03e1ade105e7d65fb591d44 /mkspecs/hpuxi-acc-64/qplatformdefs.h | |
| parent | 64158ff163a53ff97d8ae211b0bddaae346f0f7c (diff) | |
| parent | c18beac8163634b48bbf1e7280923e96f5ef0a51 (diff) | |
| download | Qt-e09de4df3ab7f57c107a1b14b80dec5728292b05.zip Qt-e09de4df3ab7f57c107a1b14b80dec5728292b05.tar.gz Qt-e09de4df3ab7f57c107a1b14b80dec5728292b05.tar.bz2 | |
Merge remote branch 'qt/master' into staging-2-master
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
Diffstat (limited to 'mkspecs/hpuxi-acc-64/qplatformdefs.h')
| -rw-r--r-- | mkspecs/hpuxi-acc-64/qplatformdefs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h index a0d2464..6aafed2 100644 --- a/mkspecs/hpuxi-acc-64/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h @@ -78,6 +78,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 #include "../common/posix/qplatformdefs.h" #undef QT_OPEN_LARGEFILE |