From 3b0e0c7178c92587c1c436b8c4d41500bf4adfa4 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 18 Apr 2015 22:12:46 -0700
Subject: [PATCH] Qt: Backport fix for solar sensor keybindings

---
 CHANGES                    | 1 +
 src/platform/qt/Window.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 353b08daa..da2c71a9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ Bugfixes:
  - GBA Memory: Fix 32-bit loads from unaddress cartridge space
 Misc:
  - Qt: Show multiplayer numbers in window title
+ - Qt: Solar sensor can have shortcuts set
 
 0.2.0: (2015-04-03)
 Features:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 14bc594a4..0f4d1a2fa 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -692,6 +692,7 @@ void Window::setupMenu(QMenuBar* menubar) {
 	emulationMenu->addSeparator();
 
 	QMenu* solarMenu = emulationMenu->addMenu(tr("Solar sensor"));
+	m_shortcutController->addMenu(solarMenu);
 	QAction* solarIncrease = new QAction(tr("Increase solar level"), solarMenu);
 	connect(solarIncrease, SIGNAL(triggered()), m_controller, SLOT(increaseLuminanceLevel()));
 	addControlledAction(solarMenu, solarIncrease, "increaseLuminanceLevel");