diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-10 15:51:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-10 15:51:48 (GMT) |
| commit | c072fa8fdd0cebcaff9062e07d4623bbd7aded3c (patch) | |
| tree | db35223ec643fbc5aeadcfab4112e5686ff44b8f /src/tools/uic/cpp/cppwriteinitialization.cpp | |
| parent | bf54d63fb1b60ad899d0b14889109278bd04fd9d (diff) | |
| parent | 9a83bf2676dabdf36f9ca491b480b50d8e7ed93d (diff) | |
| download | Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.zip Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.gz Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 8099ffa..dc1d181 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -721,8 +721,9 @@ 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 { - m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n"; + } else if (!m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3DockWindow")) + && !m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3ToolBar"))) { + m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n"; } } |