diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 21:27:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 21:27:12 (GMT) |
| commit | cb188229132e36ef1fe1af4c8e2db0df6047be76 (patch) | |
| tree | ff42bedd48d786152967d4b92c3b19f48a07b4ba /tools/designer/src/lib | |
| parent | 98072ecf6a6dc07ac82038adf66048a1c17dbbb5 (diff) | |
| parent | fa23cdf45a2416f0a4505f9f9bc63a83603dab74 (diff) | |
| download | Qt-cb188229132e36ef1fe1af4c8e2db0df6047be76.zip Qt-cb188229132e36ef1fe1af4c8e2db0df6047be76.tar.gz Qt-cb188229132e36ef1fe1af4c8e2db0df6047be76.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Designer: Allow promoted QWidget's to be buddies.
Designer: Specify 'notr' attribute for buttongroup name.
Diffstat (limited to 'tools/designer/src/lib')
| -rw-r--r-- | tools/designer/src/lib/uilib/abstractformbuilder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp index 402a771..ecb43db 100644 --- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp @@ -2291,6 +2291,7 @@ void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, Do DomPropertyList attributes = ui_widget->elementAttribute(); DomString *domString = new DomString(); domString->setText(buttonGroup->objectName()); + domString->setAttributeNotr(QLatin1String("true")); DomProperty *domProperty = new DomProperty(); domProperty->setAttributeName(QLatin1String(buttonGroupPropertyC)); domProperty->setElementString(domString); |