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

QmlDesigner: Prevent potential nullptr access

Browse Source 
Change-Id: Ia11e0968bfc1368e3485a4b5f0d0ea0fa95a7a3f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-05 14:41:45 +01:00
committed by Tim Jenssen
parent d88ba65a57
commit c4ff03d8b5
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp
View File

@@ -193,15 +193,6 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp
QWidget *widget = QStyledItemDelegate::createEditor(parent, option, index); QWidget *widget = QStyledItemDelegate::createEditor(parent, option, index);
const DynamicPropertiesModel *model = qobject_cast<const DynamicPropertiesModel*>(index.model()); const DynamicPropertiesModel *model = qobject_cast<const DynamicPropertiesModel*>(index.model());
model->connectionView()->allModelNodes();
// PropertiesComboBox *dynamicPropertiesComboBox = qobject_cast<DynamicPropertiesComboBox*>(widget);
// if (!dynamicPropertiesComboBox) {
// return widget;
// }
if (!model) { if (!model) {
qWarning() << "BindingDelegate::createEditor no model"; qWarning() << "BindingDelegate::createEditor no model";
return widget; return widget;
@@ -211,6 +202,13 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp
qWarning() << "BindingDelegate::createEditor no connection view"; qWarning() << "BindingDelegate::createEditor no connection view";
return widget; return widget;
} }
model->connectionView()->allModelNodes();
// PropertiesComboBox *dynamicPropertiesComboBox = qobject_cast<DynamicPropertiesComboBox*>(widget);
// if (!dynamicPropertiesComboBox) {
// return widget;
// }
BindingProperty bindingProperty = model->bindingPropertyForRow(index.row()); BindingProperty bindingProperty = model->bindingPropertyForRow(index.row());