Merge remote-tracking branch 'origin/4.2'

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

Change-Id: I245212bd45104636b1c9737b36d3db3e4af23092

src/plugins/nim/project/nimproject.cpp

@@ -140,6 +140,8 @@ void NimProject::updateProject()
     rootProjectNode()->buildTree(fileNodes);
 
     emit fileListChanged();
+
+    emit parsingFinished();
 }
 
 bool NimProject::supportsKit(Kit *k, QString *) const