From effc03daae37f357ce3852b65004b3d8fab3d4a9 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@sosco.com>
Date: Thu, 20 Aug 2009 21:10:41 +0200
Subject: Fix errors in commit d4c0be3b

Reviewed-By: jbarron
---
 src/corelib/kernel/qcoreapplication.cpp | 2 ++
 src/gui/kernel/qclipboard_s60.cpp       | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 88df7ac..74b5140 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -284,7 +284,9 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv)
 
 QCoreApplicationPrivate::~QCoreApplicationPrivate()
 {
+#ifdef Q_OS_SYMBIAN
     fileServerSession.Close();
+#endif
     if (threadData) {
 #ifndef QT_NO_THREAD
         void *data = &threadData->tls;
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index bb792f0..26ea844 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -79,8 +79,6 @@ public:
     bool connected()
     { return connection; }
     void clear();
-    RFs fsSession();
-
 
 private:
     QMimeData* src;
@@ -222,7 +220,7 @@ void QClipboard::setMimeData(QMimeData* src, Mode mode)
     if (d)
     {
         TRAPD(err,{
-            RFs fs = d->fsSession();
+            RFs& fs = QCoreApplicationPrivate::fsSession();
             CClipboard* cb = CClipboard::NewForWritingLC(fs);
             RStoreWriteStream  stream;
             TStreamId stid = stream.CreateLC(cb->Store());
-- 
cgit v0.12