diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-13 07:19:44 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-13 07:19:44 +0000 |
| commit | 9a969182cfa452fdb305bc9fe0becc6b358f91c1 (patch) | |
| tree | 9850ac418b869e42e17d82cc14d2fe0aa93a3192 /src/plugins/platforms/ios/quiview.mm | |
| parent | f7020a31c02f4d1e5a46ce2ea20e38751f9afeed (diff) | |
| parent | 6b8c0a50585bb637c5cd33ca8ffde0cb9c4e3664 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/ios/quiview.mm')
| -rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 53b3d30327..4dd43be465 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -286,10 +286,14 @@ QTouchDevice *touchDevice = QIOSIntegration::instance()->touchDevice(); QTouchDevice::Capabilities touchCapabilities = touchDevice->capabilities(); - if (self.traitCollection.forceTouchCapability == UIForceTouchCapabilityAvailable) - touchCapabilities |= QTouchDevice::Pressure; - else - touchCapabilities &= ~QTouchDevice::Pressure; + + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_IOS_9_0) { + if (self.traitCollection.forceTouchCapability == UIForceTouchCapabilityAvailable) + touchCapabilities |= QTouchDevice::Pressure; + else + touchCapabilities &= ~QTouchDevice::Pressure; + } + touchDevice->setCapabilities(touchCapabilities); } |