SDL Controllers: report the Joystick name

The controller name is a generic "XInput Controller",
while the joystick is more meaningful (e.g.)
"Microsoft X-Box 360 pad", the same as evdev.

Change-Id: If93acdadb20f0601cc08069efed4718b4320d3a3
Reviewed-by: Andy Maloney <asmaloney@gmail.com>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp b/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp
index b990868..6a7cee6 100644
--- a/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp
+++ b/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp
@@ -191,9 +191,13 @@ void QSdlGamepadBackend::addController(int index)
     SDL_GameController *controller = SDL_GameControllerOpen(index);
     if (controller) {
         m_indexForController.insert(index, controller);
-        int instanceID = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller));
+
+        SDL_Joystick *joystick = SDL_GameControllerGetJoystick(controller);
+
+        int instanceID = SDL_JoystickInstanceID(joystick);
         m_instanceIdForIndex.insert(instanceID, index);
-        const char *name = SDL_GameControllerName(controller);
+
+        const char *name = SDL_JoystickName(joystick);
 
         //qDebug() << "Controller " << index << " added with instanceId: " << instanceID;
         emit gamepadAdded(index);