Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -2085,6 +2085,8 @@ QTextCodec *EditorManager::defaultTextCodec() const
     if (QTextCodec *candidate = QTextCodec::codecForName(
             settings->value(QLatin1String(Constants::SETTINGS_DEFAULTTEXTENCODING)).toByteArray()))
         return candidate;
+    if (QTextCodec *defaultUTF8 = QTextCodec::codecForName("UTF-8"))
+        return defaultUTF8;
     return QTextCodec::codecForLocale();
 }