diff options
author | Rolland Dudemaine <rolland@ghs.com> | 2011-09-19 17:03:22 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-18 12:11:44 +0100 |
commit | 8fd2801a1f3d114694d94aa55b5b7920e1e6bded (patch) | |
tree | 4fb773637382cf9221ace02d5e4c8d3023217856 /src/corelib/io/io.pri | |
parent | d645ff182b51977b3677c07d2ee789283b3de87f (diff) |
Resolve a number of compilation issues with INTEGRITY
First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode.
Also, correct a typo and add missing files to io.pri.
Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools.
Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it.
Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition).
Merge-request: 2686
Reviewed-by: ossi
(cherry picked from commit 8fe04a14b1f3688c9ce0933ebec0c28616595d93)
Change-Id: I8fe04a14b1f3688c9ce0933ebec0c28616595d93
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/io/io.pri')
-rw-r--r-- | src/corelib/io/io.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 6d7a59d1b3..4fa5ed035e 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -126,5 +126,7 @@ win32 { } integrity { SOURCES += io/qfsfileengine_unix.cpp \ - io/qfsfileengine_iterator_unix.cpp + io/qfsfileengine_iterator.cpp \ + io/qfilesystemengine_unix.cpp \ + io/qfilesystemiterator_unix.cpp } |