Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
2a5f6181
Commit
2a5f6181
authored
Jun 21, 2014
by
Fabio Bas
Browse files
Osx: removed plugins path detection and fixed translation path detection
parent
b44365b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/main.cpp
View file @
2a5f6181
...
@@ -88,15 +88,6 @@ int main(int argc, char *argv[])
...
@@ -88,15 +88,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
...
@@ -108,11 +99,12 @@ int main(int argc, char *argv[])
...
@@ -108,11 +99,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
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment