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 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7
This commit is contained in:
Eike Ziller
2015-04-13 10:53:03 +02:00
parent 1de861f06b 7b8d670bd8
commit 11590a8c5f
56 changed files with 841 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/diffeditor/diffeditorcontroller.cpp
View File

@@ -48,7 +48,6 @@ DiffEditorController::DiffEditorController(Core::IDocument *document) :
m_chunkIndex(-1)
{
QTC_ASSERT(m_document, return);
QTC_CHECK(!m_document->controller());
m_document->setController(this);
}

2
src/plugins/diffeditor/diffeditormanager.cpp
View File

@@ -76,7 +76,7 @@ Core::IDocument *DiffEditorManager::findOrCreate(const QString &vcsId, const QSt
QTC_ASSERT(diffEditor, return 0);
document = qobject_cast<Internal::DiffEditorDocument *>(diffEditor->document());
QTC_ASSERT(diffEditor, return 0);
QTC_ASSERT(document, return 0);
document->setPreferredDisplayName(displayName);