diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-13 10:14:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-13 10:14:24 (GMT) |
| commit | 060155f2819b4dbad9d91cffa8af1d6ec7e4338c (patch) | |
| tree | 1a4914c3d9a62ecfa5dbf200ddb120801a531b83 /mkspecs | |
| parent | 6944a72cd26a5e3611ebd305ec665bc4c0fcee12 (diff) | |
| parent | 8911ed8bfe7f918b93c758f9b5d93274b37739e6 (diff) | |
| download | Qt-060155f2819b4dbad9d91cffa8af1d6ec7e4338c.zip Qt-060155f2819b4dbad9d91cffa8af1d6ec7e4338c.tar.gz Qt-060155f2819b4dbad9d91cffa8af1d6ec7e4338c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
qdoc3: Completed handling of the new \pagekeywords command.
Wrong cursor shown by the parent window after setOverrideCursor().
Fixed Mac OS X compile time error by using GLint for temp.
qdoc3: Added curly braces in switch statement for braindead compiler.
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/posix/qplatformdefs.h | 4 | ||||
| -rw-r--r-- | mkspecs/hpux-acc-64/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/hpux-acc-o64/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/hpux-acc/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/hpux-g++-64/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/hpux-g++/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/hpuxi-acc-32/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/hpuxi-acc-64/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/hpuxi-g++-64/qplatformdefs.h | 1 |
9 files changed, 11 insertions, 1 deletions
diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h index e29bc6f..6310257 100644 --- a/mkspecs/common/posix/qplatformdefs.h +++ b/mkspecs/common/posix/qplatformdefs.h @@ -138,7 +138,9 @@ #define QT_OPENDIR ::opendir #define QT_CLOSEDIR ::closedir -#if defined(QT_USE_XOPEN_LFS_EXTENSIONS) && defined(QT_LARGEFILE_SUPPORT) +#if defined(QT_LARGEFILE_SUPPORT) \ + && defined(QT_USE_XOPEN_LFS_EXTENSIONS) \ + && !defined(QT_NO_READDIR64) #define QT_DIRENT struct dirent64 #define QT_READDIR ::readdir64 #define QT_READDIR_R ::readdir64_r diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h index f9789a8..c1a9ab8 100644 --- a/mkspecs/hpux-acc-64/qplatformdefs.h +++ b/mkspecs/hpux-acc-64/qplatformdefs.h @@ -77,6 +77,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 #include "../common/posix/qplatformdefs.h" #undef QT_OPEN_LARGEFILE diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h index 5237806..c622d80 100644 --- a/mkspecs/hpux-acc-o64/qplatformdefs.h +++ b/mkspecs/hpux-acc-o64/qplatformdefs.h @@ -78,6 +78,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 #include "../common/posix/qplatformdefs.h" #undef QT_SOCKLEN_T diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h index 9ce08c6..c18ad49 100644 --- a/mkspecs/hpux-acc/qplatformdefs.h +++ b/mkspecs/hpux-acc/qplatformdefs.h @@ -80,6 +80,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 #include "../common/posix/qplatformdefs.h" #undef QT_OPEN_LARGEFILE diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h index f3fbda5..e9a9e75 100644 --- a/mkspecs/hpux-g++-64/qplatformdefs.h +++ b/mkspecs/hpux-g++-64/qplatformdefs.h @@ -77,6 +77,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 #include "../common/posix/qplatformdefs.h" #endif // QPLATFORMDEFS_H diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h index 38e9408..9296ac2 100644 --- a/mkspecs/hpux-g++/qplatformdefs.h +++ b/mkspecs/hpux-g++/qplatformdefs.h @@ -79,6 +79,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 #include "../common/posix/qplatformdefs.h" #undef QT_SOCKLEN_T diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h index a0d2464..6aafed2 100644 --- a/mkspecs/hpuxi-acc-32/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-32/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 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 diff --git a/mkspecs/hpuxi-g++-64/qplatformdefs.h b/mkspecs/hpuxi-g++-64/qplatformdefs.h index 288a331..f6789ee 100644 --- a/mkspecs/hpuxi-g++-64/qplatformdefs.h +++ b/mkspecs/hpuxi-g++-64/qplatformdefs.h @@ -77,6 +77,7 @@ #endif #define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 #include "../common/posix/qplatformdefs.h" #undef QT_OPEN_LARGEFILE |