diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-25 15:04:11 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-25 15:04:11 (GMT) |
| commit | 0411ecc38e6c48263de3e5fef2bd8ba3adf61d97 (patch) | |
| tree | f555609fccea16128797b7951403ba9f459e9b62 /src/tools/uic/cpp/cppwriteinitialization.cpp | |
| parent | 5bda4e27bbe3fde98bd5c628fada76dfccadad0e (diff) | |
| parent | ede20ecdb0ddef7ef239900eb3bfa92ca859e010 (diff) | |
| download | Qt-0411ecc38e6c48263de3e5fef2bd8ba3adf61d97.zip Qt-0411ecc38e6c48263de3e5fef2bd8ba3adf61d97.tar.gz Qt-0411ecc38e6c48263de3e5fef2bd8ba3adf61d97.tar.bz2 | |
Merge branch 'master' into staging-1-master
Conflicts:
doc/src/getting-started/installation.qdoc
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 88dfa98..d9aff1b 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -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"))) { |