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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
This commit is contained in:
Eike Ziller
2016-08-31 14:40:38 +02:00
parent a4bf137a9f 89ff2c1db5
commit c56aa52b80
36 changed files with 488 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/textmark.cpp
View File

@@ -294,7 +294,7 @@ void TextMarkRegistry::documentRenamed(IDocument *document, const
QString &oldName, const QString &newName)
{
TextDocument *baseTextDocument = qobject_cast<TextDocument *>(document);
if (!document)
if (!baseTextDocument)
return;
FileName oldFileName = FileName::fromString(oldName);
FileName newFileName = FileName::fromString(newName);