Merge remote-tracking branch 'origin/4.15'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibd07b5b5ff7c3282134b062ed28b1c4951061c97

src/plugins/cmakeprojectmanager/fileapireader.cpp

@@ -64,8 +64,6 @@ FileApiReader::FileApiReader()
 
 FileApiReader::~FileApiReader()
 {
-    if (isParsing())
-        emit errorOccurred(tr("Parsing has been canceled."));
     stop();
     resetData();
 }