feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source
This commit is contained in:
Eike Ziller
2015-03-16 10:27:16 +01:00
parent c185d06997 302148e2c5
commit bf7da428fb
43 changed files with 615 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -76,10 +76,11 @@ DiffEditorDocument::~DiffEditorDocument()
*/
void DiffEditorDocument::setController(DiffEditorController *controller)
{
QTC_ASSERT(isTemporary(), return);
if (m_controller == controller)
return;
QTC_ASSERT(isTemporary(), return);
if (m_controller)
m_controller->deleteLater();
m_controller = controller;