feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Fix using system codec

Browse Source 
Qt5 doesn't return a valid codec when looking up the "System" codec, but
will return such a codec when asking for the codec for locale and no
matching codec is available. So check whether this system codec was
saved to the settings.

Task-number: QTCREATORBUG-21622
Change-Id: I4dc3ab47a3a54f7e4ad4e00004c2622b26182db3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2018-12-11 10:24:54 +01:00
parent 1934119c42
commit c773fabc06
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -3040,9 +3040,16 @@ void EditorManager::hideEditorStatusBar(const QString &id)
QTextCodec *EditorManager::defaultTextCodec() QTextCodec *EditorManager::defaultTextCodec()
{ {
QSettings *settings = ICore::settings(); QSettings *settings = ICore::settings();
if (QTextCodec *candidate = QTextCodec::codecForName( const QByteArray codecName =
settings->value(Constants::SETTINGS_DEFAULTTEXTENCODING).toByteArray())) settings->value(Constants::SETTINGS_DEFAULTTEXTENCODING).toByteArray();
if (QTextCodec *candidate = QTextCodec::codecForName(codecName))
return candidate; return candidate;
// Qt5 doesn't return a valid codec when looking up the "System" codec, but will return
// such a codec when asking for the codec for locale and no matching codec is available.
// So check whether such a codec was saved to the settings.
QTextCodec *localeCodec = QTextCodec::codecForLocale();
if (codecName == localeCodec->name())
return localeCodec;
if (QTextCodec *defaultUTF8 = QTextCodec::codecForName("UTF-8")) if (QTextCodec *defaultUTF8 = QTextCodec::codecForName("UTF-8"))
return defaultUTF8; return defaultUTF8;
return QTextCodec::codecForLocale(); return QTextCodec::codecForLocale();