M CHANGES → CHANGES

@@ -50,6 +50,7 @@ - Debugger: Free watchpoints in addition to breakpoints
  - Qt: Move GL frame drawing back onto its own thread
  - GBA: Add status log level
  - GBA Thread: Add functionality for running callbacks on the GBA thread
+ - Qt: Fast forward (held) option moved from Other to Emulation menu
 
 0.2.0: (2015-04-03)
 Features:

M src/platform/qt/Window.cpp → src/platform/qt/Window.cpp

@@ -722,6 +722,12 @@ addControlledAction(emulationMenu, frameAdvance, "frameAdvance");
 
 	emulationMenu->addSeparator();
 
+	m_shortcutController->addFunctions(emulationMenu, [this]() {
+		m_controller->setTurbo(true, false);
+	}, [this]() {
+		m_controller->setTurbo(false, false);
+	}, QKeySequence(Qt::Key_Tab), tr("Fast forward (held)"), "holdFastForward");
+
 	QAction* turbo = new QAction(tr("&Fast forward"), emulationMenu);
 	turbo->setCheckable(true);
 	turbo->setChecked(false);
@@ -1012,11 +1018,6 @@ }, this);
 
 	QMenu* other = new QMenu(tr("Other"), this);
 	m_shortcutController->addMenu(other);
-	m_shortcutController->addFunctions(other, [this]() {
-		m_controller->setTurbo(true, false);
-	}, [this]() {
-		m_controller->setTurbo(false, false);
-	}, QKeySequence(Qt::Key_Tab), tr("Fast Forward (held)"), "holdFastForward");
 
 	addControlledAction(other, other->addAction(tr("Exit fullscreen"), this, SLOT(exitFullScreen()), QKeySequence("Esc")), "exitFullScreen");