diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-11 13:39:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-11 13:39:55 +0100 |
| commit | 52bf71fbdff62bdcd0c67e0a5edc45b695b3c519 (patch) | |
| tree | a0bcc473630b26eb4aa600b83a916053fd99ef89 /src/plugins/diffeditor/diffeditor.cpp | |
| parent | ee299651df3bcfc1c8745dc4e10394b47865f5c8 (diff) | |
| parent | 01715c61722a8cbe3d800759bbd5d590fccdc525 (diff) | |
| download | qt-creator-52bf71fbdff62bdcd0c67e0a5edc45b695b3c519.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
README
tests/auto/debugger/tst_dumpers.cpp
Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index ec2d205c8c..875af4ddb6 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -113,7 +113,7 @@ void DescriptionEditorWidget::setDisplaySettings(const DisplaySettings &ds) DiffEditor::DiffEditor() : IEditor(0) - , m_document(new DiffEditorDocument(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE))) + , m_document(new DiffEditorDocument()) , m_descriptionWidget(0) , m_diffWidget(0) , m_controller(0) |