Merge remote-tracking branch 'origin/4.14'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I5b8d93f2f08b62626c3f3447728c64d198b601ff

src/plugins/git/gitplugin.cpp

@@ -471,7 +471,7 @@ GitPlugin::~GitPlugin()
 
 void GitPluginPrivate::onApplySettings()
 {
-    configurationChanged();
+    emit configurationChanged();
     updateRepositoryBrowserAction();
     bool gitFoundOk;
     QString errorMessage;