diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-12 07:21:04 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-19 08:21:26 +0000 |
| commit | 0c11e6c300a0377259ee44ad01d533d87ca68a38 (patch) | |
| tree | d5f748e7dab88cd600a538039de6c1d611eab921 | |
| parent | 09c28ca679169dc65014aef06461617de9d8fa1a (diff) | |
| download | qttools-0c11e6c300a0377259ee44ad01d533d87ca68a38.tar.gz | |
QFormBuilder: Save the 'name' attribute
Move the setting of the name attribute to the base class.
Fixes: QTBUG-91088
Change-Id: I29955b5455015b4fc38b7f35d2247dac30d82d22
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit a8a01b6d2d7f5aab7b800bf054a6c323e1e78ab5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/designer/src/components/formeditor/qdesigner_resource.cpp | 3 | ||||
| -rw-r--r-- | src/designer/src/lib/uilib/abstractformbuilder.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index 9b4fd2434..e46a01bfa 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -1169,12 +1169,9 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid if (m_internal_to_qt.contains(className)) w->setAttributeClass(m_internal_to_qt.value(className)); - w->setAttributeName(widget->objectName()); - if (isPromoted( core(), widget)) { // is promoted? Q_ASSERT(widgetInfo != nullptr); - w->setAttributeName(widget->objectName()); w->setAttributeClass(widgetInfo->name()); const auto &prop_list = w->elementProperty(); diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index 6c93c2c1d..cbe53f392 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -1103,6 +1103,8 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent { DomWidget *ui_widget = new DomWidget(); ui_widget->setAttributeClass(QLatin1String(widget->metaObject()->className())); + ui_widget->setAttributeName(widget->objectName()); + ui_widget->setElementProperty(computeProperties(widget)); if (recursive) { |