diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 15:51:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 15:51:49 (GMT) |
| commit | 69bc7ba41375e3f00b2111bda8d2743654960f71 (patch) | |
| tree | 0c1e9b573ba6eaee4ec8686937ad12307f40dc51 /src | |
| parent | d63accf173ed58c7746ecd1e3a40ecac263f186f (diff) | |
| parent | 522660346023c025d14bfa029f70c88d18eb609d (diff) | |
| download | Qt-69bc7ba41375e3f00b2111bda8d2743654960f71.zip Qt-69bc7ba41375e3f00b2111bda8d2743654960f71.tar.gz Qt-69bc7ba41375e3f00b2111bda8d2743654960f71.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:
uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup
Changelog: Added Designer/uic entries for 4.6.1
Designer: Enable seconds editing for Q[Date]TimeEdit's properties.
Designer: Selection handles disappear when using style sheet on form.
do not accumulate messages
Diffstat (limited to 'src')
| -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"))) { |