summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication_p.h
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-25 10:51:44 +0200
committerJason Barron <jbarron@trolltech.com>2009-08-25 10:51:44 +0200
commit8cee5b06aa0ecde7ba0a53c8a46070af3691db1b (patch)
tree4cd7f5ffb8b31af78f095c40fa6021a0331fde3b /src/corelib/kernel/qcoreapplication_p.h
parentf729015e1f44065b1b1911b65ba3fddd35d5545b (diff)
parentf049061a7b479c957240ec8e4fd91d1e9463b071 (diff)
Merge commit 'origin/master' into 4.6
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
-rw-r--r--src/corelib/kernel/qcoreapplication_p.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 1adb837c1..6c30ce81e 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -90,10 +90,6 @@ 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);
@@ -126,9 +122,6 @@ 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