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 /tests/auto/uic3/baseline | |
| 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 'tests/auto/uic3/baseline')
| -rw-r--r-- | tests/auto/uic3/baseline/config.ui | 11 | ||||
| -rw-r--r-- | tests/auto/uic3/baseline/config.ui.4 | 10 |
2 files changed, 21 insertions, 0 deletions
diff --git a/tests/auto/uic3/baseline/config.ui b/tests/auto/uic3/baseline/config.ui index 1ffeab3..dc02682 100644 --- a/tests/auto/uic3/baseline/config.ui +++ b/tests/auto/uic3/baseline/config.ui @@ -1648,6 +1648,17 @@ <string><p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>.</string> </property> </widget> + <widget class="QRadioButton"> + <property name="name"> + <cstring>test_for_useless_buttongroupId</cstring> + </property> + <property name="text"> + <string>Test</string> + </property> + <property name="buttonGroupId"> + <string>1</string> + </property> + </widget> </grid> </widget> <customwidgets> diff --git a/tests/auto/uic3/baseline/config.ui.4 b/tests/auto/uic3/baseline/config.ui.4 index 17e6a7c..0bd6256 100644 --- a/tests/auto/uic3/baseline/config.ui.4 +++ b/tests/auto/uic3/baseline/config.ui.4 @@ -1595,6 +1595,16 @@ </property> </widget> </item> + <item> + <widget class="QRadioButton" name="test_for_useless_buttongroupId"> + <property name="text"> + <string>Test</string> + </property> + <property name="buttonGroupId"> + <string>1</string> + </property> + </widget> + </item> </layout> </widget> <layoutdefault spacing="6" margin="11"/> |