summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-18 15:48:32 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-18 15:48:32 (GMT)
commit4baa9dfb5273d7b501dcb3f456983262c53cc8d1 (patch)
treeaf04bea96067fcb8c282067aea00703a25b52069 /mkspecs
parent9eacc56619ce471a9777f88c89f64ca95cd6ae63 (diff)
parentc18beac8163634b48bbf1e7280923e96f5ef0a51 (diff)
downloadQt-4baa9dfb5273d7b501dcb3f456983262c53cc8d1.zip
Qt-4baa9dfb5273d7b501dcb3f456983262c53cc8d1.tar.gz
Qt-4baa9dfb5273d7b501dcb3f456983262c53cc8d1.tar.bz2
Merge remote branch 'origin/master' into qt-master-from-4.6
Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/posix/qplatformdefs.h4
-rw-r--r--mkspecs/hpux-acc-64/qplatformdefs.h1
-rw-r--r--mkspecs/hpux-acc-o64/qplatformdefs.h1
-rw-r--r--mkspecs/hpux-acc/qplatformdefs.h1
-rw-r--r--mkspecs/hpux-g++-64/qplatformdefs.h1
-rw-r--r--mkspecs/hpux-g++/qplatformdefs.h1
-rw-r--r--mkspecs/hpuxi-acc-32/qplatformdefs.h1
-rw-r--r--mkspecs/hpuxi-acc-64/qplatformdefs.h1
-rw-r--r--mkspecs/hpuxi-g++-64/qplatformdefs.h1
-rw-r--r--mkspecs/linux-g++-x11egl/qplatformdefs.h2
-rw-r--r--mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h2
-rw-r--r--mkspecs/unsupported/qws/qnx-641/qplatformdefs.h2
12 files changed, 14 insertions, 4 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
diff --git a/mkspecs/linux-g++-x11egl/qplatformdefs.h b/mkspecs/linux-g++-x11egl/qplatformdefs.h
index 1430916..dd3b9a1 100644
--- a/mkspecs/linux-g++-x11egl/qplatformdefs.h
+++ b/mkspecs/linux-g++-x11egl/qplatformdefs.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h b/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
index 60e0f5e..b0551e5 100644
--- a/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
index af04086..5912a51 100644
--- a/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
generated by cgit v0.12 at 2024-09-05 03:53:33 (GMT)