Merge remote-tracking branch 'origin/11.0'

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

Change-Id: If3ada34dcc764fa1d0cce04fd343fb5a02c2fbaa

src/plugins/mesonprojectmanager/ninjabuildstep.cpp

@@ -59,6 +59,7 @@ QWidget *NinjaBuildStep::createConfigWidget()
     buildTargetsList->setFrameShadow(QFrame::Raised);
 
     auto toolArguments = new QLineEdit(widget);
+    toolArguments->setText(m_commandArgs);
 
     auto wrapper = Core::ItemViewFind::createSearchableWrapper(buildTargetsList,
                                                                Core::ItemViewFind::LightColored);