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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Change-Id: Ieb0bb1ebab9a5efb42d15bbeac2cd4c46a6de962
This commit is contained in:
Eike Ziller
2019-12-18 09:02:56 +01:00
parent ef680f547c 546d4a3b1a
commit e16876df0c
30 changed files with 231 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/texteditor.cpp
View File

@@ -833,6 +833,10 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
m_fileLineEnding->addItems(ExtraEncodingSettings::lineTerminationModeNames());
m_fileLineEnding->setContentsMargins(spacing, 0, spacing, 0);
m_fileLineEndingAction = m_toolBar->addWidget(m_fileLineEnding);
m_fileLineEndingAction->setVisible(!q->isReadOnly());
connect(q, &TextEditorWidget::readOnlyChanged, this, [this] {
m_fileLineEndingAction->setVisible(!q->isReadOnly());
});
m_fileEncodingLabel = new FixedSizeClickLabel;
m_fileEncodingLabel->setContentsMargins(spacing, 0, spacing, 0);