Merge remote-tracking branch 'origin/4.9'

Change-Id: I7bdb6a4658c5fca1a7e1dda5adbb5613dabc6d18
This commit is contained in:
Eike Ziller
2019-02-19 09:08:53 +01:00
50 changed files with 817 additions and 328 deletions

View File

@@ -1451,8 +1451,9 @@ void DebuggerPluginPrivate::updatePresetState()
if (startupRunConfigName.isEmpty() && startupProject)
startupRunConfigName = startupProject->displayName();
// Restrict width, otherwise Creator gets too wide, see QTCREATORBUG-21885
const QString startToolTip =
canRun ? tr("Start debugging of \"%1\"").arg(startupRunConfigName) : whyNot;
canRun ? tr("Start debugging of startup project") : whyNot;
m_startAction.setToolTip(startToolTip);
m_startAction.setText(canRun ? startToolTip : tr("Start Debugging"));