diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:57:12 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:58:13 +0100 |
commit | c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9 (patch) | |
tree | 7e9802171d7b4c641c2de1ef781023cab5d7d14c /src/corelib/io/qfile.h | |
parent | 7da3a61b5fd5cc726f8fd62691aa5f84c7929800 (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c
Diffstat (limited to 'src/corelib/io/qfile.h')
-rw-r--r-- | src/corelib/io/qfile.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index bf7290dda2..7f370d4214 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -144,10 +144,8 @@ public: bool isSequential() const; bool open(OpenMode flags); - bool open(FILE *f, OpenMode flags); - bool open(int fd, OpenMode flags); - bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags); - bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags); + bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); + bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); virtual void close(); qint64 size() const; |