diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
| commit | 6bc6003cb2a2bb770d4e060653f18c05d8f4296b (patch) | |
| tree | 44cddd871e6cac48345a04bb900addf9626b5e8b /src/corelib/io/qfsfileengine.cpp | |
| parent | bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8 (diff) | |
| download | Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.zip Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.gz Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.bz2 | |
Squashed merge of the master-temp branch.
Conflicts:
doc/src/examples/maemovibration.qdoc
Diffstat (limited to 'src/corelib/io/qfsfileengine.cpp')
| -rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index 802d394..bf4308a 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -472,10 +472,10 @@ qint64 QFSFileEngine::size() const return d->nativeSize(); } +#ifndef Q_OS_WIN /*! \internal */ -#ifndef Q_OS_WIN qint64 QFSFileEnginePrivate::sizeFdFh() const { Q_Q(const QFSFileEngine); |