diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-10 13:54:25 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-10 13:54:25 (GMT) |
| commit | c7f8dc9ad153ee28c1c38f6096f72b46c747d2b1 (patch) | |
| tree | f0aed01d4f2c8f4ddf2ed570fb6d872c4c17943e /src/tools/uic/cpp/cppwriteinitialization.cpp | |
| parent | d44081d5a63cebd05783b343dd4ef364345855ff (diff) | |
| parent | b9f676f68cffdd2b5fe2ea68f9eca65947e0fbfe (diff) | |
| download | Qt-c7f8dc9ad153ee28c1c38f6096f72b46c747d2b1.zip Qt-c7f8dc9ad153ee28c1c38f6096f72b46c747d2b1.tar.gz Qt-c7f8dc9ad153ee28c1c38f6096f72b46c747d2b1.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"; } } |