diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 12:56:34 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 12:56:34 +0300 |
commit | a28db67043f46fb9fc6536af9786fd77d2e346b3 (patch) | |
tree | ce3a70a8deef96c3bd3496afda0834c09339b432 /src/gui/kernel/qclipboard_s60.cpp | |
parent | 6d2a500a32fd3e0536420708c845bbb2799c92d1 (diff) | |
parent | 898cba2245b6fafa3820b44203442fedd9f7ed73 (diff) |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
Diffstat (limited to 'src/gui/kernel/qclipboard_s60.cpp')
-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 26ea8449c..9a2629c30 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()); |