diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-11-02 10:36:20 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-12-21 13:25:54 +0000 |
| commit | 4aac07d0237cd4895f670ae2df6a8844ab91b699 (patch) | |
| tree | d9c79f91f844e42a5e779fe52edb7b5751d31f1a /src/plugins/platforms/android/qandroidplatformclipboard.h | |
| parent | 28b2232e7818f560bcd6c57f09ef42f2363e5338 (diff) | |
Android: Add support for setting/getting html and uris from clipboard
This also updates the used API to use ClipData and not the deprecated
ClipboardManager API.
[ChangeLog][Platform Specific Changes][Android] QClipboard now supports
HTML and URI data.
Fixes: QTBUG-47835
Fixes: QTBUG-71503
Change-Id: I43f82bfc63b3d159087c0fb6c840c186a370e20c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformclipboard.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformclipboard.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformclipboard.h b/src/plugins/platforms/android/qandroidplatformclipboard.h index dfc3629c10..3ed9d323f8 100644 --- a/src/plugins/platforms/android/qandroidplatformclipboard.h +++ b/src/plugins/platforms/android/qandroidplatformclipboard.h @@ -46,7 +46,7 @@ #ifndef QT_NO_CLIPBOARD QT_BEGIN_NAMESPACE -class QAndroidPlatformClipboard: public QPlatformClipboard +class QAndroidPlatformClipboard : public QObject, public QPlatformClipboard { public: QAndroidPlatformClipboard(); @@ -54,9 +54,6 @@ public: QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override; void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override; bool supportsMode(QClipboard::Mode mode) const override; - -private: - QMimeData m_mimeData; }; QT_END_NAMESPACE |