summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2014-10-09 12:37:56 +0200
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2014-10-10 13:37:51 +0200
commit9685c72e37d618cf44aa15c892375b3c8d27e578 (patch)
tree497c6248a4b9087a76a497e09dfadd39fe830365 /src
parentaa0002057835065d6ddb2be4d3c4deeda3276785 (diff)
Android: Return empty mime data instead of 0 from empty clipboard
This is consistent with other platforms such as iOS and XCB, which return a QMimeData with an empty text when the clipboard is empty. [ChangeLog][Android] QClipboard::mimeData() now returns an empty object instead of null pointer from QClipboard when clipboard is empty for consistency with other platforms. Change-Id: I17068f0afcb63690cf11048ffa60e19dc9b08691 Task-number: QTBUG-41817 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/android/qandroidplatformclipboard.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformclipboard.cpp b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
index 3515be436d..a975f4a852 100644
--- a/src/plugins/platforms/android/qandroidplatformclipboard.cpp
+++ b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
@@ -44,10 +44,10 @@ QAndroidPlatformClipboard::QAndroidPlatformClipboard()
QMimeData *QAndroidPlatformClipboard::mimeData(QClipboard::Mode mode)
{
- if (QClipboard::Clipboard != mode || !QtAndroidClipboard::hasClipboardText())
- return 0;
-
- m_mimeData.setText(QtAndroidClipboard::clipboardText());
+ Q_ASSERT(supportsMode(mode));
+ m_mimeData.setText(QtAndroidClipboard::hasClipboardText()
+ ? QtAndroidClipboard::clipboardText()
+ : QString());
return &m_mimeData;
}