diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-11-16 10:06:51 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-11-16 10:06:51 (GMT) |
| commit | 6809bd020e3307324e136707f32f6f17f77b9591 (patch) | |
| tree | 193cc929ab3e4ddf70270193bfb854c3b5020d19 /src/tools | |
| parent | 56a643bfd14e919968ee4b88dd6b8d7ac78f1036 (diff) | |
| download | Qt-6809bd020e3307324e136707f32f6f17f77b9591.zip Qt-6809bd020e3307324e136707f32f6f17f77b9591.tar.gz Qt-6809bd020e3307324e136707f32f6f17f77b9591.tar.bz2 | |
uic: Call to setCentralWidget() not generated for promoted central widgets.
Remove check for central widget class type after checks for special child
types (QMenu, etc as in formbuilder).
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-5824
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 74a4b9d..b2e8f4f 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -721,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"; } } |