diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/kernel/qclipboard_qpa.cpp | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/kernel/qclipboard_qpa.cpp')
| -rw-r--r-- | src/gui/kernel/qclipboard_qpa.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp index 6a88129168..737b2131c0 100644 --- a/src/gui/kernel/qclipboard_qpa.cpp +++ b/src/gui/kernel/qclipboard_qpa.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_CLIPBOARD #include "qmimedata.h" -#include "private/qapplication_p.h" +#include "private/qguiapplication_p.h" #include "qplatformclipboard_qpa.h" QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ QT_USE_NAMESPACE void QClipboard::clear(Mode mode) { - setMimeData(0,mode); + setMimeData(0, mode); } @@ -64,14 +64,14 @@ bool QClipboard::event(QEvent *e) const QMimeData* QClipboard::mimeData(Mode mode) const { - QPlatformClipboard *clipboard = QApplicationPrivate::platformIntegration()->clipboard(); + QPlatformClipboard *clipboard = QGuiApplicationPrivate::platformIntegration()->clipboard(); if (!clipboard->supportsMode(mode)) return 0; return clipboard->mimeData(mode); } void QClipboard::setMimeData(QMimeData* src, Mode mode) { - QPlatformClipboard *clipboard = QApplicationPrivate::platformIntegration()->clipboard(); + QPlatformClipboard *clipboard = QGuiApplicationPrivate::platformIntegration()->clipboard(); if (!clipboard->supportsMode(mode)) return; clipboard->setMimeData(src,mode); @@ -81,15 +81,14 @@ void QClipboard::setMimeData(QMimeData* src, Mode mode) bool QClipboard::supportsMode(Mode mode) const { - QPlatformClipboard *clipboard = QApplicationPrivate::platformIntegration()->clipboard(); + QPlatformClipboard *clipboard = QGuiApplicationPrivate::platformIntegration()->clipboard(); return clipboard->supportsMode(mode); } bool QClipboard::ownsMode(Mode mode) const { - if (mode == Clipboard) - qWarning("QClipboard::ownsClipboard: UNIMPLEMENTED!"); - return false; + QPlatformClipboard *clipboard = QGuiApplicationPrivate::platformIntegration()->clipboard(); + return clipboard->ownsMode(mode); } void QClipboard::connectNotify( const char * ) |