Merge remote-tracking branch 'origin/3.2'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -606,6 +606,8 @@ bool CMakeProject::fromMap(const QVariantMap &map)
 bool CMakeProject::setupTarget(Target *t)
 {
     t->updateDefaultBuildConfigurations();
+    if (t->buildConfigurations().isEmpty())
+        return false;
     t->updateDefaultDeployConfigurations();
 
     return true;