diff options
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 16 | 
1 files changed, 12 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 5a1c1850d4..2627c4cf5c 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -913,6 +913,7 @@ void WriteInitialization::acceptLayout(DomLayout *node)      m_layoutMarginType = SubLayoutMargin;      DomPropertyList propList = node->elementProperty(); +    DomPropertyList newPropList;      if (m_layoutWidget) {          bool left, top, right, bottom;          left = top = right = bottom = false; @@ -932,31 +933,38 @@ void WriteInitialization::acceptLayout(DomLayout *node)              DomProperty *p = new DomProperty();              p->setAttributeName(QLatin1String("leftMargin"));              p->setElementNumber(0); -            propList.append(p); +            newPropList.append(p);          }          if (!top) {              DomProperty *p = new DomProperty();              p->setAttributeName(QLatin1String("topMargin"));              p->setElementNumber(0); -            propList.append(p); +            newPropList.append(p);          }          if (!right) {              DomProperty *p = new DomProperty();              p->setAttributeName(QLatin1String("rightMargin"));              p->setElementNumber(0); -            propList.append(p); +            newPropList.append(p);          }          if (!bottom) {              DomProperty *p = new DomProperty();              p->setAttributeName(QLatin1String("bottomMargin"));              p->setElementNumber(0); -            propList.append(p); +            newPropList.append(p);          }          m_layoutWidget = false;      } +    propList.append(newPropList); +      writeProperties(varName, className, propList, WritePropertyIgnoreMargin|WritePropertyIgnoreSpacing); +    // Clean up again: +    propList.clear(); +    qDeleteAll(newPropList); +    newPropList.clear(); +      m_layoutChain.push(node);      TreeWalker::acceptLayout(node);      m_layoutChain.pop();  | 
