Merge remote-tracking branch 'origin/3.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -651,6 +651,8 @@ void QmakeProject::update()
     m_asyncUpdateState = Base;
     enableActiveQmakeBuildConfiguration(activeTarget(), true);
     updateBuildSystemData();
+    if (activeTarget())
+        activeTarget()->updateDefaultDeployConfigurations();
     updateRunConfigurations();
     emit proFilesEvaluated();
 }