Merge from trunk

This commit is contained in:
Charles Haley 2011-08-08 17:13:46 +01:00
commit 272bc523ad

View File

@ -48,6 +48,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>40</number>
</property>
</widget>
</item>
<item row="1" column="1">