diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-27 11:50:56 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-27 11:50:56 +0100 |
| commit | ba1d5f2cdf7d31eb862f02bd42885cdba13a7f15 (patch) | |
| tree | 5c9d0551e67612724a2ca0328636b091653c1f00 /src/app | |
| parent | c384f52b49f0eddc7a7f8e622e1485ebb1018028 (diff) | |
| parent | deeef5308f1b3d59581aa1a65e781d434719a40d (diff) | |
| download | qt-creator-ba1d5f2cdf7d31eb862f02bd42885cdba13a7f15.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/share.qbs
src/plugins/cpptools/cppchecksymbols.cpp
src/plugins/texteditor/behaviorsettingswidget.cpp
Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index a963816ae9..c25affca02 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -359,7 +359,11 @@ int main(int argc, char **argv) const QString &creatorTrPath = QCoreApplication::applicationDirPath() + QLatin1String(SHARE_PATH "/translations"); foreach (QString locale, uiLanguages) { +#if (QT_VERSION >= 0x050000) + locale = QLocale(locale).name(); +#else locale.replace(QLatin1Char('-'), QLatin1Char('_')); // work around QTBUG-25973 +#endif if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) { const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); const QString &qtTrFile = QLatin1String("qt_") + locale; |