diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-06-07 15:23:12 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2013-06-07 15:36:55 +0200 |
commit | 2ddcc0c3862bcb114b93b2bd4de6922f6b9d1ef9 (patch) | |
tree | 41f2cfb701bf3f3dc11145e04f05cd68e6834c3d /src/plugins/diffeditor/diffeditorplugin.h | |
parent | c8b478f0bdfd30a0dfb0cf4066930e7b676a7a62 (diff) | |
download | qt-creator-2ddcc0c3862bcb114b93b2bd4de6922f6b9d1ef9.tar.gz |
Fix wrong diff output with span lines
Task-number: QTCREATORBUG-9494
Change-Id: Ica26e1448b1997e102648be58128f1be00c4905e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.h')
-rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.h b/src/plugins/diffeditor/diffeditorplugin.h index 8c1303d7a4..12b4b5bd1c 100644 --- a/src/plugins/diffeditor/diffeditorplugin.h +++ b/src/plugins/diffeditor/diffeditorplugin.h @@ -65,6 +65,10 @@ public: private slots: void diff(); +#ifdef WITH_TESTS + void testAssemblyRows(); +#endif // WITH_TESTS + private: QString getFileContents(const QString &fileName, QTextCodec *codec) const; |