Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d

src/plugins/qt4projectmanager/qt4project.cpp

@@ -1412,7 +1412,8 @@ QString Qt4Project::buildNameFor(const Kit *k)
 {
     if (!k)
         return QLatin1String("unknown");
-    return QString::fromLatin1(k->id().name()).mid(31, 6); // part of the UUID, should be pretty unique;-)
+
+    return k->fileSystemFriendlyName();
 }
 
 Target *Qt4Project::createTarget(Kit *k, const QList<BuildConfigurationInfo> &infoList)