diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-18 08:34:18 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-18 08:34:18 +0200 |
| commit | fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf (patch) | |
| tree | aa2ba4ce64d047d73c29ab0616e8a89d352c3abd /src/corelib/io/qfile.cpp | |
| parent | d24029e3d4639f1300e7a68858936911df969f69 (diff) | |
| parent | 572e165dcb8cc8fcdfaa4ab9bdab050f6a6cc173 (diff) | |
Merge commit 'qt/master'
Conflicts:
doc/src/examples.qdoc
doc/src/plugins-howto.qdoc
doc/src/topics.qdoc
examples/phonon/musicplayer/mainwindow.cpp
src/3rdparty/freetype/src/base/ftobjs.c
src/corelib/global/qglobal.h
src/corelib/tools/qalgorithms.h
src/corelib/tools/qshareddata.cpp
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/tools.pri
src/corelib/xml/qxmlstream.h
src/gui/painting/painting.pri
src/gui/widgets/qdatetimeedit.cpp
tests/auto/qdesktopservices/qdesktopservices.pro
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qtextcodec/test/test.pro
Diffstat (limited to 'src/corelib/io/qfile.cpp')
| -rw-r--r-- | src/corelib/io/qfile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 69f1ff56a9..5e1a5e741d 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -174,7 +174,7 @@ QFilePrivate::setError(QFile::FileError err, int errNum) \brief The QFile class provides an interface for reading from and writing to files. \ingroup io - \mainclass + \reentrant QFile is an I/O device for reading and writing text and binary |