diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 22:02:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 22:02:42 (GMT) |
| commit | ef704ebad66559170d761459d42d6c99996db529 (patch) | |
| tree | e7772e3e9fec69d2816d36c5bb73441facf7d06b /src/corelib | |
| parent | 667d94f6ab824a9b56c28943f02054467741e070 (diff) | |
| parent | 4117403ad5170110849b7d0663337b1571304a8e (diff) | |
| download | Qt-ef704ebad66559170d761459d42d6c99996db529.zip Qt-ef704ebad66559170d761459d42d6c99996db529.tar.gz Qt-ef704ebad66559170d761459d42d6c99996db529.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Simplify calculation of center point and scale for PinchRecongizer
Doc: Fixing typo
QtDFB: Make transparent windows behave better
For meego graphics system, use floyd-steinberg dithering when converting to 16bit.
Added support for blitting to native child widgets in GL window surface.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfsfileengine_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index d83f7ee..69e9219 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -695,7 +695,7 @@ bool QFSFileEnginePrivate::doStat() const } else if (fd == -1) { // ### actually covers two cases: d->fh and when the file is not open #if defined(Q_OS_SYMBIAN) - // Optimisation for Symbian where fileFlags() calls both doStat() and isSymlink(), but rarely on real links. + // Optimization for Symbian where fileFlags() calls both doStat() and isSymlink(), but rarely on real links. // When the filename is not a link, lstat will return the same info as stat, but this also removes // any need for a further call to lstat to check if the file is a link. need_lstat = false; |