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

TextEditor: Fix regression introduced by recent c094592f8a

Browse Source 
Change-Id: I9fe2bc726454c8c44f59bf4c720a11765d1bb744
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-28 17:00:12 +02:00
parent b4d62d330c
commit 761f8de751
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -229,14 +229,10 @@ DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
connect(m_descriptionWidget, SIGNAL(expandBranchesRequested()),
m_document->controller(), SLOT(expandBranchesRequested()));
connect(TextEditorSettings::instance(),
SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)),
m_descriptionWidget,
SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
connect(TextEditorSettings::instance(),
SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
m_descriptionWidget->textDocument(),
SLOT(setFontSettings(TextEditor::FontSettings)));
connect(TextEditorSettings::instance(), &TextEditorSettings::displaySettingsChanged,
m_descriptionWidget, &BaseTextEditorWidget::setDisplaySettings);
connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
m_descriptionWidget->textDocument(), &BaseTextDocument::setFontSettings);
m_descriptionWidget->setDisplaySettings(
TextEditorSettings::displaySettings());