diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:15:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:15:14 +0200 |
| commit | ff440191de244307c968b251faee4122267d3094 (patch) | |
| tree | 404244208e4a65cc60d576cb751768b48e36f7ff /src/designer/src | |
| parent | a2a0ff8676bce46ed1ae7c387cbcd2f5377a0e01 (diff) | |
| parent | 277af20762813ff92ea47a69b4d18563e01cc18e (diff) | |
| download | qttools-ff440191de244307c968b251faee4122267d3094.tar.gz | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I3fe629d8a2493504e8cfea56c590db4fc92e3d56
Diffstat (limited to 'src/designer/src')
| -rw-r--r-- | src/designer/src/components/propertyeditor/designerpropertymanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp index 8edd361da..28104439d 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -897,6 +897,7 @@ DesignerPropertyManager::DesignerPropertyManager(QDesignerFormEditorInterface *c QtVariantPropertyManager(parent), m_changingSubValue(false), m_core(core), + m_object(nullptr), m_sourceOfChange(0) { connect(this, &QtVariantPropertyManager::valueChanged, |