diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2013-04-19 10:48:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-22 14:38:28 +0200 |
| commit | 8a00a42d0dc902153dd1f12981f2a8980cfd4272 (patch) | |
| tree | d155feefcb1ce087c128b6f2834175d4a4c412c7 | |
| parent | 38f6467b818cff995e08630037b8b0c46e20ec43 (diff) | |
iOS: don't delete m_touchDevice, QPA takes ownership
When registering m_touchDevice with QWindowSystemInterface, it
will also transfer ownership to it. It will eventually be
deleted in clenupDevicesList on qtouchdevice.cpp.
This patch will also stop the app from crashing when telling it
to quit.
Change-Id: I97070efdf16b4db7d076935fbec62e60f094a7df
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.h | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h index 329a0a3d9b..c352e0f2d2 100644 --- a/src/plugins/platforms/ios/qiosintegration.h +++ b/src/plugins/platforms/ios/qiosintegration.h @@ -52,7 +52,6 @@ class QIOSIntegration : public QPlatformIntegration, public QPlatformNativeInter { public: QIOSIntegration(); - ~QIOSIntegration(); bool hasCapability(Capability cap) const; diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index c7541c3e38..61fd1c3d60 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -79,11 +79,6 @@ QIOSIntegration::QIOSIntegration() QWindowSystemInterface::registerTouchDevice(m_touchDevice); } -QIOSIntegration::~QIOSIntegration() -{ - delete m_touchDevice; -} - bool QIOSIntegration::hasCapability(Capability cap) const { switch (cap) { |