diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-08 05:50:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-08 05:50:11 (GMT) |
| commit | b8dcbb9dc467bfd792828c27d49232abff062580 (patch) | |
| tree | 279eb51018d97e41c8eb5e2522485e9b8209caa9 /src/corelib/io | |
| parent | 2bddf15b87a9e27bfdcbc3aec5d79da49f070c15 (diff) | |
| parent | f67e4e1bc58d3587caa70d1be58c6da14c150ce2 (diff) | |
| download | Qt-b8dcbb9dc467bfd792828c27d49232abff062580.zip Qt-b8dcbb9dc467bfd792828c27d49232abff062580.tar.gz Qt-b8dcbb9dc467bfd792828c27d49232abff062580.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:
Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
Fix compilation error on Solaris
Check elapsed time only once
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemengine.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemengine.cpp b/src/corelib/io/qfilesystemengine.cpp index d9d802e..9446ebb 100644 --- a/src/corelib/io/qfilesystemengine.cpp +++ b/src/corelib/io/qfilesystemengine.cpp @@ -289,6 +289,9 @@ void QFileSystemMetaData::fillFromStatBuf(const QT_STATBUF &statBuffer) void QFileSystemMetaData::fillFromDirEnt(const QT_DIRENT &entry) { +#if defined(_DIRENT_HAVE_D_TYPE) || defined(Q_OS_BSD4) || defined(Q_OS_SYMBIAN) + // BSD4 includes Mac OS X + // ### This will clear all entry flags and knownFlagsMask switch (entry.d_type) { @@ -344,6 +347,9 @@ void QFileSystemMetaData::fillFromDirEnt(const QT_DIRENT &entry) default: clear(); } +#else + Q_UNUSED(entry) +#endif } #endif |