diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-07 23:30:02 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-07 23:30:02 (GMT) |
| commit | 3f3e86d6fce5bb781bc41def35d0f15c58ef769c (patch) | |
| tree | f79a0317d168a1961c11c2b8f3b772029e2902e1 /src/tools/uic/cpp/cppwriteinitialization.cpp | |
| parent | dbbf451755d34be44f6b7ac2e7c03ffe5528fb1b (diff) | |
| parent | a3c1b0703575ed5fc364011c73dc104ecdb8ef0c (diff) | |
| download | Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.zip Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.gz Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 88dfa98..3bc56ae 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1221,9 +1221,10 @@ void WriteInitialization::writeProperties(const QString &varName, const DomRect *r = p->elementRect(); m_output << m_indent << varName << "->resize(" << r->elementWidth() << ", " << r->elementHeight() << ");\n"; continue; - } else if (propertyName == QLatin1String("buttonGroupId") && buttonGroupWidget) { // Q3ButtonGroup support - m_output << m_indent << m_driver->findOrInsertWidget(buttonGroupWidget) << "->insert(" - << varName << ", " << p->elementNumber() << ");\n"; + } else if (propertyName == QLatin1String("buttonGroupId")) { // Q3ButtonGroup support + if (buttonGroupWidget) + m_output << m_indent << m_driver->findOrInsertWidget(buttonGroupWidget) << "->insert(" + << varName << ", " << p->elementNumber() << ");\n"; continue; } else if (propertyName == QLatin1String("currentRow") // QListWidget::currentRow && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QListWidget"))) { |