summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfsfileengine.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-06-24 09:12:15 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-06-24 09:12:15 (GMT)
commit11cc0f661911628fb51c92d30c684eb1cea01145 (patch)
tree3f89e82669b12ea49e0586d3ff14c0d01594301e /src/corelib/io/qfsfileengine.cpp
parent9d5b0e31f287ce502eaf9a2c0876d900424c80ab (diff)
parent164728f711136356a6c3482f762321b01c9d82dd (diff)
downloadQt-11cc0f661911628fb51c92d30c684eb1cea01145.zip
Qt-11cc0f661911628fb51c92d30c684eb1cea01145.tar.gz
Qt-11cc0f661911628fb51c92d30c684eb1cea01145.tar.bz2
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/corelib/io/qfsfileengine.cpp')
-rw-r--r--src/corelib/io/qfsfileengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index 4894754..0d23a27 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);