diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
| commit | aa674169ca31b6e296021b3b8f5a448aeecf0973 (patch) | |
| tree | 493f0b7922ac116894a3e7f99833e97984035ccc /src/gui/text | |
| parent | 50a668e62739c715dcd4f001b659ff25f71cc9c4 (diff) | |
| parent | 941b13d52d975069d10093a873cd3a55bb2fd7dd (diff) | |
| download | Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.zip Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.gz Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.bz2 | |
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qzip.cpp | 9 | ||||
| -rw-r--r-- | src/gui/text/qzipreader_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qzipwriter_p.h | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index 2fc1940..d30c996 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -54,10 +54,13 @@ #include <zlib.h> #if defined(Q_OS_WIN) -#undef S_IFREG -#define S_IFREG 0100000 +# undef S_IFREG +# define S_IFREG 0100000 +# ifndef S_IFDIR +# define S_IFDIR 0040000 +# endif # ifndef S_ISDIR -# define S_ISDIR(x) ((x) & 0040000) > 0 +# define S_ISDIR(x) ((x) & S_IFDIR) > 0 # endif # ifndef S_ISREG # define S_ISREG(x) ((x) & 0170000) == S_IFREG diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h index 1086464..67a2ace 100644 --- a/src/gui/text/qzipreader_p.h +++ b/src/gui/text/qzipreader_p.h @@ -49,7 +49,7 @@ // ------------- // // This file is not part of the Qt API. It exists for the convenience -// of the QLibrary class. This header file may change from +// of the QZipReader class. This header file may change from // version to version without notice, or even be removed. // // We mean it. diff --git a/src/gui/text/qzipwriter_p.h b/src/gui/text/qzipwriter_p.h index 7b97937..9322f4a 100644 --- a/src/gui/text/qzipwriter_p.h +++ b/src/gui/text/qzipwriter_p.h @@ -47,7 +47,7 @@ // ------------- // // This file is not part of the Qt API. It exists for the convenience -// of the QLibrary class. This header file may change from +// of the QZipWriter class. This header file may change from // version to version without notice, or even be removed. // // We mean it. |