diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
| commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
| tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /src/corelib/kernel/qcoreapplication_p.h | |
| parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index 169835f12..1adb837c1 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -57,6 +57,10 @@ #include "QtCore/qtranslator.h" #include "private/qobject_p.h" +#ifdef Q_OS_SYMBIAN +#include <f32file.h> +#endif + QT_BEGIN_NAMESPACE typedef QList<QTranslator*> QTranslatorList; @@ -86,6 +90,10 @@ public: static QString macMenuBarName(); #endif +#ifdef Q_OS_SYMBIAN + static RFs& fsSession(); +#endif + static QThread *theMainThread; static QThread *mainThread(); static bool checkInstance(const char *method); @@ -118,6 +126,9 @@ public: static uint attribs; static inline bool testAttribute(uint flag) { return attribs & (1 << flag); } +#ifdef Q_OS_SYMBIAN + static RFs fileServerSession; //this should be moved into a symbian file engine if/when one is written +#endif }; QT_END_NAMESPACE |