Merge remote-tracking branch 'origin/4.1'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0

src/plugins/android/androidconfigurations.cpp

@@ -922,8 +922,10 @@ QString AndroidConfig::getAvdName(const QString &serialnumber)
     // The input "avd name" might not be echoed as-is, but contain ASCII
     // control sequences.
     for (int i = response.size() - 1; i > 1; --i) {
-        if (response.at(i).startsWith("OK"))
+        if (response.at(i).startsWith("OK")) {
             name = response.at(i - 1);
+            break;
+        }
     }
     return QString::fromLatin1(name).trimmed();
 }