mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-11 16:44:48 -07:00
Merge remote-tracking branch 'upstream/master' into cmake_qt5
This commit is contained in:
commit
54805fb14e
4 changed files with 29 additions and 16 deletions
|
|
@ -121,7 +121,7 @@ int main(int argc, char *argv[])
|
|||
if (translationPath.isEmpty()) {
|
||||
#ifdef Q_OS_MAC
|
||||
translationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
|
||||
#elif Q_OS_WIN
|
||||
#elif defined(Q_OS_WIN)
|
||||
translationPath = app.applicationDirPath() + "/translations";
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue