diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-11-24 15:43:48 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-11-24 15:43:48 +0100 |
| commit | a47fbb83094ac2d2014fdd563ae22be9f0200baa (patch) | |
| tree | 2b29ca96979b5facf549131aee58c13e9c2c368b /src/plugins/diffeditor/diffeditorcontroller.h | |
| parent | 63487158f1928f2d8499995783610839904ab149 (diff) | |
| parent | a4a4f7a4759e97142f751fdb91cb11536e5102e2 (diff) | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/coreplugin/coreplugin.cpp
src/plugins/coreplugin/themesettingswidget.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.h
src/plugins/qmlprofiler/qml/Overview.js
src/shared/qbs
Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
Diffstat (limited to 'src/plugins/diffeditor/diffeditorcontroller.h')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorcontroller.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h index f310364414..43f65a86a1 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.h +++ b/src/plugins/diffeditor/diffeditorcontroller.h @@ -58,6 +58,7 @@ public: bool isIgnoreWhitespace() const; QString makePatch(bool revert, bool addPrefix = false) const; + QString contents() const; DiffEditorReloader *reloader() const; void setReloader(DiffEditorReloader *reloader); |