diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-25 08:51:44 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-25 08:51:44 (GMT) |
| commit | 8cee5b06aa0ecde7ba0a53c8a46070af3691db1b (patch) | |
| tree | 4cd7f5ffb8b31af78f095c40fa6021a0331fde3b /src/gui | |
| parent | f729015e1f44065b1b1911b65ba3fddd35d5545b (diff) | |
| parent | f049061a7b479c957240ec8e4fd91d1e9463b071 (diff) | |
| download | Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.zip Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.tar.gz Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.tar.bz2 | |
Merge commit 'origin/master' into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.h | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qclipboard_s60.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h index 56bdef7..a50ee29 100644 --- a/src/gui/effects/qgraphicseffect.h +++ b/src/gui/effects/qgraphicseffect.h @@ -80,8 +80,8 @@ protected: QGraphicsEffectSource(QGraphicsEffectSourcePrivate &dd, QObject *parent = 0); private: - Q_DECLARE_PRIVATE(QGraphicsEffectSource); - Q_DISABLE_COPY(QGraphicsEffectSource); + Q_DECLARE_PRIVATE(QGraphicsEffectSource) + Q_DISABLE_COPY(QGraphicsEffectSource) friend class QGraphicsEffect; friend class QGraphicsEffectPrivate; friend class QGraphicsScenePrivate; @@ -103,7 +103,7 @@ public: SourceBoundingRectChanged = 0x4, SourceInvalidated = 0x8 }; - Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag); + Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) QGraphicsEffect(QObject *parent = 0); virtual ~QGraphicsEffect(); 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()); |