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/diffeditordocument.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/diffeditordocument.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditordocument.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index fd7cdf2b74..1bd386034e 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -35,9 +35,8 @@ namespace DiffEditor { -DiffEditorDocument::DiffEditorDocument(const QString &mimeType) : +DiffEditorDocument::DiffEditorDocument() : Core::IDocument(), - m_mimeType(mimeType), m_diffEditorController(new DiffEditorController(this)) { setId(Constants::DIFF_EDITOR_ID); @@ -70,7 +69,7 @@ bool DiffEditorDocument::save(QString *errorString, const QString &fileName, boo QString DiffEditorDocument::mimeType() const { - return m_mimeType; + return QString(); } Core::IDocument::ReloadBehavior DiffEditorDocument::reloadBehavior(ChangeTrigger state, ChangeType type) const |