summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/qandroidplatformclipboard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformclipboard.cpp')
-rw-r--r--src/plugins/platforms/android/qandroidplatformclipboard.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformclipboard.cpp b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
index 86fd152bff3..fb73db84554 100644
--- a/src/plugins/platforms/android/qandroidplatformclipboard.cpp
+++ b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
@@ -44,19 +44,19 @@ 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;
}
void QAndroidPlatformClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode)
{
- if (!data || !data->hasText() || QClipboard::Clipboard != mode)
- return;
-
- QtAndroidClipboard::setClipboardText(data->text());
+ Q_ASSERT(supportsMode(mode));
+ QtAndroidClipboard::setClipboardText(data != 0 && data->hasText() ? data->text() : QString());
+ if (data != 0)
+ data->deleteLater();
}
bool QAndroidPlatformClipboard::supportsMode(QClipboard::Mode mode) const