Commit 9e7d91a5 authored by Bill King's avatar Bill King
Browse files

Fix missing breaks which lead to invalid fallthroughs.

parent 1a897869
...@@ -102,10 +102,13 @@ void PluginErrorView::update(PluginSpec *spec) ...@@ -102,10 +102,13 @@ void PluginErrorView::update(PluginSpec *spec)
case PluginSpec::Stopped: case PluginSpec::Stopped:
text = tr("Stopped"); text = tr("Stopped");
tooltip = tr("Plugin was shut down"); tooltip = tr("Plugin was shut down");
break;
case PluginSpec::Deleted: case PluginSpec::Deleted:
text = tr("Deleted"); text = tr("Deleted");
tooltip = tr("Plugin ended its life cycle and was deleted"); tooltip = tr("Plugin ended its life cycle and was deleted");
break;
} }
m_ui->state->setText(text); m_ui->state->setText(text);
m_ui->state->setToolTip(tooltip); m_ui->state->setToolTip(tooltip);
m_ui->errorString->setText(spec->errorString()); m_ui->errorString->setText(spec->errorString());
......
...@@ -626,6 +626,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const ...@@ -626,6 +626,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
return tr("Breakpoint will only be hit after being ignored so many times."); return tr("Breakpoint will only be hit after being ignored so many times.");
if (role == Qt::UserRole + 1) if (role == Qt::UserRole + 1)
return data->ignoreCount; return data->ignoreCount;
break;
case 6: case 6:
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
if (data->pending) if (data->pending)
...@@ -637,6 +638,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const ...@@ -637,6 +638,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
return tr("Breakpoint will only be hit in the specified thread(s)."); return tr("Breakpoint will only be hit in the specified thread(s).");
if (role == Qt::UserRole + 1) if (role == Qt::UserRole + 1)
return data->threadSpec; return data->threadSpec;
break;
case 7: case 7:
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
if (data->type == BreakpointData::WatchpointType) if (data->type == BreakpointData::WatchpointType)
......
...@@ -1219,6 +1219,7 @@ void QtDumperHelper::evaluationParameters(const WatchData &data, ...@@ -1219,6 +1219,7 @@ void QtDumperHelper::evaluationParameters(const WatchData &data,
break; break;
case StdDequeType: case StdDequeType:
extraArgs[1] = zero; extraArgs[1] = zero;
break;
case StdStackType: case StdStackType:
// remove 'std::allocator<...>': // remove 'std::allocator<...>':
extraArgs[1] = zero; extraArgs[1] = zero;
......
...@@ -129,6 +129,7 @@ void GCCEToolChain::addToEnvironment(ProjectExplorer::Environment &env) ...@@ -129,6 +129,7 @@ void GCCEToolChain::addToEnvironment(ProjectExplorer::Environment &env)
switch (m_type) { switch (m_type) {
case ProjectExplorer::ToolChain::GCCE: case ProjectExplorer::ToolChain::GCCE:
m_mixin.addEpocToEnvironment(&env); m_mixin.addEpocToEnvironment(&env);
break;
case ProjectExplorer::ToolChain::GCCE_GNUPOC: case ProjectExplorer::ToolChain::GCCE_GNUPOC:
m_mixin.addGnuPocToEnvironment(&env); m_mixin.addGnuPocToEnvironment(&env);
break; break;
......
...@@ -107,6 +107,8 @@ public: ...@@ -107,6 +107,8 @@ public:
QColor background = m_scheme->formatFor(description.id()).background(); QColor background = m_scheme->formatFor(description.id()).background();
if (background.isValid()) if (background.isValid())
return background; return background;
else
break;
} }
case Qt::FontRole: { case Qt::FontRole: {
QFont font = m_baseFont; QFont font = m_baseFont;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment