summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/ios
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2016-10-27 14:06:49 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2016-10-28 07:32:52 +0000
commit3daa76d49499a1b03ff8296d3aab8f6fa4c23267 (patch)
treea4e4fa5a2b18c90de3f5d1506a0b4f4e230851dc /src/plugins/platforms/ios
parent5a92b6e8beeb9aa6d3d904c7901f13a6b22502f6 (diff)
iOS: ensure we return a non-null clipboard
QPlatformIntegration::clipboard() is not allowed to return null. This will lead to a crash as soon as someone tries to access QClipboard. Change-Id: I3c1e7cdc5103fe4424f9739a09f599d6c0af40b2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios')
-rw-r--r--src/plugins/platforms/ios/qiosintegration.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 82b5f3b755..44e636bae6 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -227,7 +227,7 @@ QPlatformClipboard *QIOSIntegration::clipboard() const
#ifndef Q_OS_TVOS
return m_clipboard;
#else
- return 0;
+ return QPlatformIntegration::clipboard();
#endif
}
#endif