History

Merge branch 'master' of https://github.com/worklist/hifi into 20660

Thijs Wenker committed 11 years ago

Commit 0f8cf802 parents 63f0173 53f981580 files · +2139 −880Browse files

Showing the changes to interface/src/Menu.cpp (1 of 80 files). Show all

Unified · Split

interface/src/Menu.cpp+3−1
@@ -16,11 +16,13 @@ · 15 unmodified lines
1616 #include <AddressManager.h>
1717 #include <AudioClient.h>
1818 #include <DependencyManager.h>
19+#include <display-plugins/DisplayPlugin.h>
1920 #include <PathUtils.h>
2021 #include <SettingHandle.h>
2122 #include <UserActivityLogger.h>
2223 #include <VrMenu.h>
2324
25+
2426 #include "Application.h"
2527 #include "AccountManager.h"
2628 #include "audio/AudioScope.h"
@@ -220,7 +222,7 @@ Menu::Menu() { · 193 unmodified lines
220222 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,
221223 qApp, SLOT(packageModel()));
222224
223− MenuWrapper* displayMenu = addMenu("Display");
225+ MenuWrapper* displayMenu = addMenu(DisplayPlugin::MENU_PATH);
224226 {
225227 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
226228 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);