History

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

atlante45 committed 13 years ago

Commit b4157592 parents 6b58e1b c738d521 file · +2 −2Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -217,8 +217,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 216 unmodified lines
217217 FvUpdater::sharedUpdater()->CheckForUpdatesSilent();
218218 #endif
219219
220− // call Menu getInstance static method to set up the menur
221− Menu::getInstance();
220+ // call Menu getInstance static method to set up the menu
221+ _window->setMenuBar(Menu::getInstance());
222222
223223 _networkAccessManager = new QNetworkAccessManager(this);
224224

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t