Merge remote-tracking branch 'origin/2.6'

Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217

src/plugins/projectexplorer/target.cpp

@@ -188,6 +188,7 @@ void Target::handleKitUpdates(Kit *k)
     setDisplayName(k->displayName());
     setIcon(k->icon());
     updateDefaultDeployConfigurations();
+    updateDeviceState(); // in case the device changed...
     emit kitChanged();
 }