diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:06 +0200 |
| commit | 4c57631f3093cd6817a13d3ba780c9411b9c679e (patch) | |
| tree | e4dfdbd99dc035ef442f74651245687885cc5c80 /src/designer/src/components/propertyeditor | |
| parent | 26027a9b13491a4851c42e12d06af87f7e864a51 (diff) | |
| parent | 577e6b2c2a7a0f241874ac6668a8661814f0d4a4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I91242ffea8752c3006c2aa28ac953ce74f4b6750
Diffstat (limited to 'src/designer/src/components/propertyeditor')
| -rw-r--r-- | src/designer/src/components/propertyeditor/propertyeditor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index 3fd600e16..02b72f308 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -911,6 +911,8 @@ void PropertyEditor::setObject(QObject *object) m_object = object; m_propertyManager->setObject(object); QDesignerFormWindowInterface *formWindow = QDesignerFormWindowInterface::findFormWindow(m_object); + if (Q_UNLIKELY(formWindow == nullptr)) // QTBUG-68507, can happen in Morph Undo macros with buddies + return; FormWindowBase *fwb = qobject_cast<FormWindowBase *>(formWindow); const bool idIdBasedTranslation = fwb && fwb->useIdBasedTranslations(); const bool idIdBasedTranslationUnchanged = (idIdBasedTranslation == DesignerPropertyManager::useIdBasedTranslations()); |