History

Removing access to the gl widget and display managers

Brad Davis committed 11 years ago

Commit 302aa9d1 parent 539063035 files · +401 −440Browse files

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

Unified · Split

interface/src/main.cpp+3−4
@@ -18,7 +18,6 @@ · 17 unmodified lines
18 18
19#include "AddressManager.h"19#include "AddressManager.h"
20#include "Application.h"20#include "Application.h"
21#include "devices/OculusManager.h"
22#include "InterfaceLogging.h"21#include "InterfaceLogging.h"
23 22
24#ifdef Q_OS_WIN23#ifdef Q_OS_WIN
@@ -97,8 +96,8 @@ int main(int argc, const char* argv[]) { · 72 unmodified lines
97 // Oculus initialization MUST PRECEDE OpenGL context creation.96 // Oculus initialization MUST PRECEDE OpenGL context creation.
98 // The nature of the Application constructor means this has to be either here,97 // The nature of the Application constructor means this has to be either here,
99 // or in the main window ctor, before GL startup.98 // or in the main window ctor, before GL startup.
100 OculusManager::init();99 Application::initPlugins();
101 100
102 int exitCode;101 int exitCode;
103 {102 {
104 QSettings::setDefaultFormat(QSettings::IniFormat);103 QSettings::setDefaultFormat(QSettings::IniFormat);
@@ -112,7 +111,7 @@ int main(int argc, const char* argv[]) { · 7 unmodified lines
112 exitCode = app.exec();111 exitCode = app.exec();
113 }112 }
114 113
115 OculusManager::deinit();114 Application::shutdownPlugins();
116#ifdef Q_OS_WIN115#ifdef Q_OS_WIN
117 ReleaseMutex(mutex);116 ReleaseMutex(mutex);
118#endif117#endif