all repos — mgba @ 58684d8cda98a33d03297e01be1345c6e4a60231

mGBA Game Boy Advance Emulator

Qt: Fix build
Vicki Pfau vi@endrift.com
Sat, 04 May 2019 19:45:21 -0700
commit

58684d8cda98a33d03297e01be1345c6e4a60231

parent

62b801c851cfac59718a60f47480e9545c9a01e4

1 files changed, 2 insertions(+), 1 deletions(-)

jump to
M src/platform/qt/ShortcutController.h → src/platform/qt/ShortcutController.h 
@@ -9,6 +9,7 @@ #include "ActionMapper.h"
 #include "GamepadAxisEvent.h"
 
 #include <QHash>
+#include <QMap>
 #include <QObject>
 #include <QString>
 

@@ -116,7 +117,7 @@ void updateKey(std::shared_ptr<Shortcut> item, int keySequence);
 
 	QHash<QString, std::shared_ptr<Shortcut>> m_items;
 	QHash<int, std::shared_ptr<Shortcut>> m_buttons;
-	QHash<std::pair<int, GamepadAxisEvent::Direction>, std::shared_ptr<Shortcut>> m_axes;
+	QMap<std::pair<int, GamepadAxisEvent::Direction>, std::shared_ptr<Shortcut>> m_axes;
 	QHash<int, std::shared_ptr<Shortcut>> m_heldKeys;
 	ActionMapper* m_actions = nullptr;
 	ConfigController* m_config = nullptr;