diff options
| author | axis <qt-info@nokia.com> | 2009-08-21 13:48:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-21 13:48:44 (GMT) |
| commit | afd7cfce7333635edc8d3637f81cc9c3023ee874 (patch) | |
| tree | 433345bd8cfd4a2c057a24ee3c906d274d6282ca /src/corelib/io/qfsfileengine_p.h | |
| parent | 044680951401487590c0ed554092dd9b7e0ee783 (diff) | |
| parent | 3513c1a01b319fb5fd4057be306c9f9506f8223d (diff) | |
| download | Qt-afd7cfce7333635edc8d3637f81cc9c3023ee874.zip Qt-afd7cfce7333635edc8d3637f81cc9c3023ee874.tar.gz Qt-afd7cfce7333635edc8d3637f81cc9c3023ee874.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60
Conflicts:
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/plugin/qlibrary.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
Diffstat (limited to 'src/corelib/io/qfsfileengine_p.h')
| -rw-r--r-- | src/corelib/io/qfsfileengine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 15cbf5c..b245dca 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -137,10 +137,11 @@ public: mutable uint is_sequential : 2; mutable uint could_stat : 1; mutable uint tried_stat : 1; -#ifdef Q_OS_UNIX +#if !defined(Q_OS_WINCE) mutable uint need_lstat : 1; mutable uint is_link : 1; #endif + bool doStat() const; bool isSymlink() const; @@ -161,7 +162,6 @@ protected: #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) QAbstractFileEngine::FileFlags getPermissions() const; - QString getLink() const; #endif }; |