diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-04 09:43:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-06 08:06:04 +0000 |
| commit | c96755ea7eede1f1881e00718fc03c3f5f693c33 (patch) | |
| tree | 0686059782e587d1379bbfc938561ec3fb974bee | |
| parent | 49a5c5547d499183f25cbfee8612ed7b6dcc8b76 (diff) | |
| download | qttools-c96755ea7eede1f1881e00718fc03c3f5f693c33.tar.gz | |
Qt Designer: Write out idbased-attribute only when set
Otherwise, all new forms saved will contain
<ui version="4.0" idbasedtr="false"> which causes unnecessary
changes and upsets older versions of uic.
Amends 85624e87256005a2560a658722da5c982c8374ad.
Task-number: QTBUG-34610
Change-Id: Ie688c5b9d1075bca96374d98b682dbbfb8bf7eca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| -rw-r--r-- | src/designer/src/components/formeditor/qdesigner_resource.cpp | 3 |
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()) { |