diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:55:45 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:55:57 (GMT) |
| commit | 8415ced03461fa4d3d9f915da0251760bd0a7202 (patch) | |
| tree | f960fd9827f85434053559f7d59e0afb528bf9ce /src/tools/uic/cpp/cppwriteinitialization.cpp | |
| parent | 132a42c28e35ac69a5af8c2b7d478b86e92b87e4 (diff) | |
| parent | 80dfb33cc5fec8fd19e78a959e02588ce58736ee (diff) | |
| download | Qt-8415ced03461fa4d3d9f915da0251760bd0a7202.zip Qt-8415ced03461fa4d3d9f915da0251760bd0a7202.tar.gz Qt-8415ced03461fa4d3d9f915da0251760bd0a7202.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2/4.6
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 83ea75f..88dfa98 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -670,10 +670,13 @@ void WriteInitialization::acceptWidget(DomWidget *node) m_layoutWidget = false; if (className == QLatin1String("QWidget") && !node->hasAttributeNative()) { - if (m_widgetChain.top() - && m_widgetChain.top()->attributeClass() != QLatin1String("QMainWindow") - && !m_uic->isContainer(m_widgetChain.top()->attributeClass())) + if (const DomWidget* parentWidget = m_widgetChain.top()) { + const QString parentClass = parentWidget->attributeClass(); + if (parentClass != QLatin1String("QMainWindow") + && !m_uic->isCustomWidgetContainer(parentClass) + && !m_uic->isContainer(parentClass)) m_layoutWidget = true; + } } m_widgetChain.push(node); m_layoutChain.push(0); @@ -718,7 +721,7 @@ void WriteInitialization::acceptWidget(DomWidget *node) m_output << m_indent << parentWidget << "->addDockWidget(" << area << varName << ");\n"; } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"))) { m_output << m_indent << parentWidget << "->setStatusBar(" << varName << ");\n"; - } else if (className == QLatin1String("QWidget")) { + } else { m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n"; } } |