Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 15:55:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed legacy resources path locator

Browse source
This commit is contained in:
Stojce Slavkovski 2013-12-18 08:05:34 +01:00
parent 4c1226ffd9
commit 397eb13680
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -144,13 +144,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
{ {
_applicationStartupTime = startup_time; _applicationStartupTime = startup_time;
#ifdef Q_OS_MAC switchToResourcesParentIfRequired();
QString resourcesPath = QCoreApplication::applicationDirPath() + "/../Resources"; QFontDatabase::addApplicationFont("resources/styles/Inconsolata.otf");
#else
QString resourcesPath = QCoreApplication::applicationDirPath() + "/resources";
#endif
QFontDatabase::addApplicationFont(resourcesPath + "/styles/Inconsolata.otf");
_window->setWindowTitle("Interface"); _window->setWindowTitle("Interface");
qInstallMessageHandler(messageHandler); qInstallMessageHandler(messageHandler);
@ -186,7 +181,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
_enableProcessVoxelsThread = _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking"); _enableProcessVoxelsThread = _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking");
// read the ApplicationInfo.ini file for Name/Version/Domain information // read the ApplicationInfo.ini file for Name/Version/Domain information
QSettings applicationInfo(resourcesPath + "/info/ApplicationInfo.ini", QSettings::IniFormat); QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat);
// set the associated application properties // set the associated application properties
applicationInfo.beginGroup("INFO"); applicationInfo.beginGroup("INFO");