diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-26 08:09:36 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-26 08:09:36 +1000 |
| commit | 11b9190a182c5f3c1055c100145b02a3975509ed (patch) | |
| tree | 2c664ad92363204c320e23f9d1e6ca29505eaf2e /src/corelib/io/qfsfileengine_p.h | |
| parent | 03686225036ebfc5cf78e3fcc66f5810a140c7d2 (diff) | |
| parent | 3671dbf34940e166b747b6f8f3f5758fd486073c (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
Diffstat (limited to 'src/corelib/io/qfsfileengine_p.h')
| -rw-r--r-- | src/corelib/io/qfsfileengine_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 365652aa0f..e9e55f32e6 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -112,7 +112,11 @@ public: HANDLE fileHandle; HANDLE mapHandle; QHash<uchar *, DWORD /* offset % AllocationGranularity */> maps; + +#ifndef Q_OS_WINCE mutable int cachedFd; +#endif + mutable DWORD fileAttrib; #else QHash<uchar *, QPair<int /*offset % PageSize*/, size_t /*length + offset % PageSize*/> > maps; |