diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 14:58:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 14:58:42 (GMT) |
| commit | 7b626760a27579263dc894d11f10cb57a576105a (patch) | |
| tree | a87177ae17f93571e1475fb53aa263a12d15c6c9 /src/corelib/io/qfile_p.h | |
| parent | ea48f884704162265791aa14c5d3e1ef4f8ddb4e (diff) | |
| parent | 55c279a2608ff174ae964e08b85b48fa3102b5b5 (diff) | |
| download | Qt-7b626760a27579263dc894d11f10cb57a576105a.zip Qt-7b626760a27579263dc894d11f10cb57a576105a.tar.gz Qt-7b626760a27579263dc894d11f10cb57a576105a.tar.bz2 | |
Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration
* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor:
Update def files
Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoption
QFile API: add API to specify if adopted file handles should be closed
Diffstat (limited to 'src/corelib/io/qfile_p.h')
| -rw-r--r-- | src/corelib/io/qfile_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h index cf76c09..085bbf0 100644 --- a/src/corelib/io/qfile_p.h +++ b/src/corelib/io/qfile_p.h @@ -67,8 +67,11 @@ protected: QFilePrivate(); ~QFilePrivate(); - bool openExternalFile(int flags, int fd); - bool openExternalFile(int flags, FILE *fh); + bool openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags); + bool openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags); +#ifdef Q_OS_SYMBIAN + bool openExternalFile(int flags, const RFile& f, QFile::FileHandleFlags handleFlags); +#endif QString fileName; mutable QAbstractFileEngine *fileEngine; |