diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-03-11 13:24:20 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-03-11 12:26:43 +0000 |
| commit | b1a71f7b9680df8f9e27eb6564d08c94b60796c1 (patch) | |
| tree | 6ac28c5ee9668b45135e57b75443fe31c66382ac /src/plugins/diffeditor/diffeditordocument.cpp | |
| parent | cce834aebcc923620d5045f3efd0bbbcb8196f6e (diff) | |
| download | qt-creator-b1a71f7b9680df8f9e27eb6564d08c94b60796c1.tar.gz | |
DiffEditor: Fix line number forcing
Change-Id: I876c8ca6bc442cec853c41c48eb2be83def4558c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditordocument.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditordocument.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index 0937a230e0..b091c3eece 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -160,6 +160,7 @@ QString DiffEditorDocument::description() const void DiffEditorDocument::setContextLineCount(int lines) { + QTC_ASSERT(!m_isContextLineCountForced, return); m_contextLineCount = lines; } @@ -181,8 +182,6 @@ bool DiffEditorDocument::isContextLineCountForced() const void DiffEditorDocument::setIgnoreWhitespace(bool ignore) { - if (m_isContextLineCountForced) - return; m_ignoreWhitespace = ignore; } |