diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 21:44:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 21:44:26 (GMT) |
| commit | 2fb1b31384e60b166078d051042331be5797f578 (patch) | |
| tree | 78d7b8c886963845b8979ecb5c706c2ef33a014a | |
| parent | d499f265aa42231fd08df18213083aebe0db59ec (diff) | |
| parent | 995fbf9648b00b3730cde15d6ebeb3831fd44785 (diff) | |
| download | Qt-2fb1b31384e60b166078d051042331be5797f578.zip Qt-2fb1b31384e60b166078d051042331be5797f578.tar.gz Qt-2fb1b31384e60b166078d051042331be5797f578.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
uic: Fixed code generating setCentralWidget()-calls of QMainWindow.
| -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"; } } |