Fixing bad merge

This commit is contained in:
Brad Davis 2015-04-21 13:18:53 -07:00
parent 7a33474245
commit e68f149aac

View file

@ -245,7 +245,7 @@ Menu::Menu() {
false,
qApp,
SLOT(setFullscreen(bool)));
#endif
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson,
0, // QML Qt::Key_P,
true, qApp, SLOT(cameraMenuChanged()));