diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 13:23:54 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 13:23:54 (GMT) |
| commit | f8fa846bdcd961105674aba3666240b6ed166b04 (patch) | |
| tree | ef2effa1ae84ba43a6bfc06651ba3fe2bf61d8b7 /src/tools | |
| parent | f9c314aa306bfd4a237594775a8aeb14c858e66d (diff) | |
| parent | b5a5c7ce06291d4f9cae15383bd35677db277138 (diff) | |
| download | Qt-f8fa846bdcd961105674aba3666240b6ed166b04.zip Qt-f8fa846bdcd961105674aba3666240b6ed166b04.tar.gz Qt-f8fa846bdcd961105674aba3666240b6ed166b04.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.2
Diffstat (limited to 'src/tools')
| -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"; } } |