diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-24 07:25:46 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-24 07:32:10 (GMT) |
| commit | 6dade01b24f3fd314cb6ec9c2979348e78740a52 (patch) | |
| tree | 881a70495578a70deb1f4684e16340403015fc70 /src/gui | |
| parent | 0f42290719ebe6d930ba28fdf256e64d9c97be37 (diff) | |
| download | Qt-6dade01b24f3fd314cb6ec9c2979348e78740a52.zip Qt-6dade01b24f3fd314cb6ec9c2979348e78740a52.tar.gz Qt-6dade01b24f3fd314cb6ec9c2979348e78740a52.tar.bz2 | |
Make the singleton file server session independent of QCoreApplication
After review comments, changed the file server session
from a member of QCoreApplication to a Q_GLOBAL_STATIC, because some
applications will want to access files before constructing the
QApplication.
Reviewed-By: Janne Anttila
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qclipboard_s60.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp index 26ea844..9a2629c 100644 --- a/src/gui/kernel/qclipboard_s60.cpp +++ b/src/gui/kernel/qclipboard_s60.cpp @@ -49,7 +49,7 @@ #include "qbuffer.h" #include "qwidget.h" #include "qevent.h" -#include "private/qapplication_p.h" +#include "private/qcore_symbian_p.h" #include <QtDebug> // Symbian's clipboard @@ -194,7 +194,7 @@ const QMimeData* QClipboard::mimeData(Mode mode) const if (d) { TRAPD(err,{ - RFs& fs = QCoreApplicationPrivate::fsSession(); + RFs fs = qt_s60GetRFs(); CClipboard* cb = CClipboard::NewForReadingLC(fs); Q_ASSERT(cb); RStoreReadStream stream; @@ -220,7 +220,7 @@ void QClipboard::setMimeData(QMimeData* src, Mode mode) if (d) { TRAPD(err,{ - RFs& fs = QCoreApplicationPrivate::fsSession(); + RFs fs = qt_s60GetRFs(); CClipboard* cb = CClipboard::NewForWritingLC(fs); RStoreWriteStream stream; TStreamId stid = stream.CreateLC(cb->Store()); |