Merge remote-tracking branch 'origin/4.1'

Conflicts:
	src/tools/clangbackend/ipcsource/projectpart.cpp

Change-Id: I2975328ae0398f70ef4403bd6cebdc80d24379c9

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -546,8 +546,6 @@ void QbsProject::changeActiveTarget(Target *t)
     BuildConfiguration *bc = 0;
     if (t) {
         m_qbsProject = m_qbsProjects.value(t);
-        if (m_qbsProject.isValid())
-            m_projectData = m_qbsProject.projectData();
         if (t->kit())
             bc = t->activeBuildConfiguration();
     }