Merge remote-tracking branch 'origin/4.3'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d
This commit is contained in:
Eike Ziller
2017-05-15 15:31:55 +02:00
39 changed files with 168 additions and 88 deletions

View File

@@ -738,7 +738,7 @@ void QbsProject::updateDocuments(const QSet<QString> &files)
foreach (IDocument *doc, currentDocuments) {
if (filesToRemove.contains(doc->filePath().toString())) {
m_qbsDocuments.remove(doc);
delete doc;
doc->deleteLater();
}
}
QSet<IDocument *> toAdd;