summaryrefslogtreecommitdiffstats
path: root/src/designer
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-09 13:06:22 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-09 13:06:22 +0200
commitda9b8b60848afad84e4a9a8452480a88ab948bb8 (patch)
tree6b6915403524c70957671430e04d8c587384302d /src/designer
parent5500aca86669ec9a6f4440fe0438850297451c90 (diff)
parentc96755ea7eede1f1881e00718fc03c3f5f693c33 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/designer')
-rw-r--r--src/designer/src/components/formeditor/qdesigner_resource.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index bd6a3aa52..b799e648c 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -507,7 +507,8 @@ void QDesignerResource::saveDom(DomUI *ui, QWidget *widget)
ui->setElementExportMacro(exportMacro);
}
- ui->setAttributeIdbasedtr(m_formWindow->useIdBasedTranslations());
+ if (m_formWindow->useIdBasedTranslations())
+ ui->setAttributeIdbasedtr(true);
const QVariantMap designerFormData = m_formWindow->formData();
if (!designerFormData.empty()) {