diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2013-05-21 15:47:04 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-05-22 11:19:34 +0200 |
| commit | 55717e1167efed27441d55e52decbda779517bb6 (patch) | |
| tree | 09e5a51fac63092e7da3862e68ad885424e21ea5 /src/plugins/diffeditor/diffeditorwidget.cpp | |
| parent | 780c8283e95b90d97a44d4de8713b98cb014f851 (diff) | |
| download | qt-creator-55717e1167efed27441d55e52decbda779517bb6.tar.gz | |
Respect tab settings in diff editor
Currently it's not possible to respect language specific tab
settings in diff editor. It can happen that one view
contains C++/Qt Quick files, while tab settings
are common for the whole view.
Change-Id: I45c6113afd7d41667b68a4daba0ac0fa4472b4e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorwidget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.cpp b/src/plugins/diffeditor/diffeditorwidget.cpp index fd8a43e958..179a3fbf0d 100644 --- a/src/plugins/diffeditor/diffeditorwidget.cpp +++ b/src/plugins/diffeditor/diffeditorwidget.cpp @@ -487,12 +487,14 @@ DiffEditorWidget::DiffEditorWidget(QWidget *parent) m_leftEditor->setHighlightCurrentLine(false); m_leftEditor->setWordWrapMode(QTextOption::NoWrap); m_leftEditor->setFontSettings(settings->fontSettings()); + m_leftEditor->setCodeStyle(settings->codeStyle()); m_rightEditor = new DiffViewEditorWidget(this); m_rightEditor->setReadOnly(true); m_rightEditor->setHighlightCurrentLine(false); m_rightEditor->setWordWrapMode(QTextOption::NoWrap); m_rightEditor->setFontSettings(settings->fontSettings()); + m_rightEditor->setCodeStyle(settings->codeStyle()); connect(m_leftEditor->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(leftSliderChanged())); |