feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Guard against some impossible situations

Browse Source 
Change-Id: Ia1fd356b4f8ef71dd3b456a3b28598ff680b9344
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-10-04 09:58:41 +02:00
parent 1bc3103ef2
commit 2e4e18161b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/debuggermainwindow.cpp
View File

@@ -568,6 +568,7 @@ void Perspective::setEnabled(bool enabled)
QToolButton *PerspectivePrivate::setupToolButton(QAction *action) QToolButton *PerspectivePrivate::setupToolButton(QAction *action)
{ {
QTC_ASSERT(action, return nullptr);
auto toolButton = new QToolButton(m_innerToolBar); auto toolButton = new QToolButton(m_innerToolBar);
toolButton->setProperty("panelwidget", true); toolButton->setProperty("panelwidget", true);
toolButton->setDefaultAction(action); toolButton->setDefaultAction(action);
@@ -577,16 +578,19 @@ QToolButton *PerspectivePrivate::setupToolButton(QAction *action)
void Perspective::addToolBarAction(QAction *action) void Perspective::addToolBarAction(QAction *action)
{ {
QTC_ASSERT(action, return);
d->setupToolButton(action); d->setupToolButton(action);
} }
void Perspective::addToolBarAction(OptionalAction *action) void Perspective::addToolBarAction(OptionalAction *action)
{ {
QTC_ASSERT(action, return);
action->m_toolButton = d->setupToolButton(action); action->m_toolButton = d->setupToolButton(action);
} }
void Perspective::addToolBarWidget(QWidget *widget) void Perspective::addToolBarWidget(QWidget *widget)
{ {
QTC_ASSERT(widget, return);
// QStyle::polish is called before it is added to the toolbar, explicitly make it a panel widget // QStyle::polish is called before it is added to the toolbar, explicitly make it a panel widget
widget->setProperty("panelwidget", true); widget->setProperty("panelwidget", true);
widget->setParent(d->m_innerToolBar); widget->setParent(d->m_innerToolBar);
@@ -644,6 +648,7 @@ void Perspective::addWindow(QWidget *widget,
bool visibleByDefault, bool visibleByDefault,
Qt::DockWidgetArea area) Qt::DockWidgetArea area)
{ {
QTC_ASSERT(widget, return);
DockOperation op; DockOperation op;
op.widget = widget; op.widget = widget;
if (anchorWidget) if (anchorWidget)