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

Add System encoding for Qt5 builds

Browse Source 
Workaround QTBUG-34283

Change-Id: Ia58c56a477d93722b21f17e54fc1acc89f1fb63f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-24 09:01:26 +03:00
committed by Orgad Shaneh
parent fc4a953bb5
commit de3f4a78e9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/behaviorsettingswidget.cpp
View File

@@ -77,6 +77,13 @@ BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent)
d->m_codecs.append(codec);
}
// Qt5 doesn't list the system locale (QTBUG-34283), so add it manually
const QString system(QLatin1String("System"));
if (d->m_ui.encodingBox->findText(system) == -1) {
d->m_ui.encodingBox->insertItem(0, system);
d->m_codecs.prepend(QTextCodec::codecForLocale());
}
connect(d->m_ui.autoIndent, SIGNAL(toggled(bool)),
this, SLOT(slotTypingSettingsChanged()));
connect(d->m_ui.smartBackspaceBehavior, SIGNAL(currentIndexChanged(int)),