diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:57 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:57 +0100 |
| commit | b3d31fb1d0f88f9a70fa3a525ff288ffad94bfe6 (patch) | |
| tree | 4de3d79f1a3c68a37cbfa304046b9d14b0ea6155 /src | |
| parent | 63eab52c3c7de8cd018f01957192f47222608f6f (diff) | |
| parent | 313f221381507eee36c8e3bd0069b3e7962da140 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I3bcb4d7022580949d068f7fc5ef3d216d9c0648d
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/gamepads/darwin/qdarwingamepadbackend.mm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm b/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm index e755f09..1298c00 100644 --- a/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm +++ b/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm @@ -105,11 +105,8 @@ break; } } -#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11) || QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_9_0) || defined(Q_OS_TVOS) + controller.playerIndex = GCControllerPlayerIndex(index); -#else - controller.playerIndex = index; -#endif QMetaObject::invokeMethod(backend, "darwinGamepadAdded", Qt::AutoConnection, Q_ARG(int, index)); |