Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -194,7 +194,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 193 unmodified lines | |||
| 194 | _isVSyncOn(true), | 194 | _isVSyncOn(true), |
| 195 | _aboutToQuit(false) | 195 | _aboutToQuit(false) |
| 196 | { | 196 | { |
| 197 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 197 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 198 | 198 | ||
| 199 | // read the ApplicationInfo.ini file for Name/Version/Domain information | 199 | // read the ApplicationInfo.ini file for Name/Version/Domain information |
| 200 | QSettings applicationInfo(Application::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); | 200 | QSettings applicationInfo(Application::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); |
| @@ -442,7 +442,6 @@ void Application::aboutToQuit() { · 241 unmodified lines | |||
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | Application::~Application() { | 444 | Application::~Application() { |
| 445 | DependencyManager::get<GLCanvas>()->setParent(NULL); | ||
| 446 | 445 | ||
| 447 | _entities.getTree()->setSimulation(NULL); | 446 | _entities.getTree()->setSimulation(NULL); |
| 448 | qInstallMessageHandler(NULL); | 447 | qInstallMessageHandler(NULL); |