aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Osx: removed plugins path detection and fixed translation path detection

Browse source
This commit is contained in:
Fabio Bas 2014-06-21 19:09:41 +02:00
parent f9554267d4
commit e39cfb7968
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cockatrice/src/main.cpp
View file

@ -80,15 +80,6 @@ int main(int argc, char *argv[])
if (app.arguments().contains("--debug-output")) if (app.arguments().contains("--debug-output"))
qInstallMsgHandler(myMessageOutput); qInstallMsgHandler(myMessageOutput);
#ifdef Q_OS_MAC
QDir baseDir(app.applicationDirPath());
baseDir.cdUp();
baseDir.cdUp();
baseDir.cdUp();
QDir pluginsDir = baseDir;
pluginsDir.cd("PlugIns");
app.addLibraryPath(pluginsDir.absolutePath());
#endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
app.addLibraryPath(app.applicationDirPath() + "/plugins"); app.addLibraryPath(app.applicationDirPath() + "/plugins");
#endif #endif
@ -100,11 +91,12 @@ int main(int argc, char *argv[])
if (translationPath.isEmpty()) { if (translationPath.isEmpty()) {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QDir translationsDir = baseDir; QDir translationsDir = app.applicationDirPath();
translationsDir.cd("..");
translationsDir.cd("Resources");
translationsDir.cd("translations"); translationsDir.cd("translations");
translationPath = translationsDir.absolutePath(); translationPath = translationsDir.absolutePath();
#endif #elif Q_OS_WIN
#ifdef Q_OS_WIN
translationPath = app.applicationDirPath() + "/translations"; translationPath = app.applicationDirPath() + "/translations";
#endif #endif
} }