Commit de3f4a78 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Add System encoding for Qt5 builds



Workaround QTBUG-34283

Change-Id: Ia58c56a477d93722b21f17e54fc1acc89f1fb63f
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent fc4a953b
......@@ -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)),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment