Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -158,7 +158,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 157 unmodified lines | |||
| 158 | // call Menu getInstance static method to set up the menu | 158 | // call Menu getInstance static method to set up the menu |
| 159 | _window->setMenuBar(Menu::getInstance()); | 159 | _window->setMenuBar(Menu::getInstance()); |
| 160 | 160 | ||
| 161 | qDebug( "[VERSION] Build sequence: %i", BUILD_VERSION); | 161 | qDebug("[VERSION] Build sequence: %i", BUILD_VERSION); |
| 162 | 162 | ||
| 163 | unsigned int listenPort = 0; // bind to an ephemeral port by default | 163 | unsigned int listenPort = 0; // bind to an ephemeral port by default |
| 164 | const char** constArgv = const_cast<const char**>(argv); | 164 | const char** constArgv = const_cast<const char**>(argv); |
| @@ -185,7 +185,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 20 unmodified lines | |||
| 185 | // network receive thread and voxel parsing thread are both controlled by the --nonblocking command line | 185 | // network receive thread and voxel parsing thread are both controlled by the --nonblocking command line |
| 186 | _enableProcessVoxelsThread = _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking"); | 186 | _enableProcessVoxelsThread = _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking"); |
| 187 | 187 | ||
| 188 | // setup QSettings | ||
| 189 | // read the ApplicationInfo.ini file for Name/Version/Domain information | 188 | // read the ApplicationInfo.ini file for Name/Version/Domain information |
| 190 | QSettings applicationInfo(resourcesPath + "/info/ApplicationInfo.ini", QSettings::IniFormat); | 189 | QSettings applicationInfo(resourcesPath + "/info/ApplicationInfo.ini", QSettings::IniFormat); |
| 191 | 190 | ||