* Cursor on Windows should not break free anymore when captured
* Use RAWINPUT for joystick on Windows * Load qt_*.qm instead of qtbase_*.qm
This commit is contained in:
@@ -150,7 +150,7 @@ void ProgSettings::loadTranslators(QObject *parent)
|
||||
qDebug() << "Translations loaded.\n";
|
||||
QCoreApplication::installTranslator(translator);
|
||||
if (!qtTranslator->load(QLatin1String("qtbase_") + localetofilename.replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
|
||||
qtTranslator->load(QLatin1String("qtbase_") + localetofilename.replace('-', '_'), QApplication::applicationDirPath() + "/./translations/");
|
||||
qtTranslator->load(QLatin1String("qt_") + localetofilename.replace('-', '_'), QApplication::applicationDirPath() + "/./translations/");
|
||||
if (QApplication::installTranslator(qtTranslator))
|
||||
{
|
||||
qDebug() << "Qt translations loaded." << "\n";
|
||||
@@ -164,7 +164,7 @@ void ProgSettings::loadTranslators(QObject *parent)
|
||||
translator->load(QLatin1String("86box_") + lcid_langcode[lang_id].first, QLatin1String(":/"));
|
||||
QCoreApplication::installTranslator(translator);
|
||||
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
|
||||
qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/");
|
||||
qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/");
|
||||
QCoreApplication::installTranslator(qtTranslator);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user