Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
dt
2009-05-25 17:09:50 +02:00
2 changed files with 27 additions and 29 deletions

View File

@@ -13,8 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>AddressBook</string> <string>AddressBook</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="QWidget" name="">
<item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="nameEdit"> <widget class="QLabel" name="nameEdit">
@@ -40,8 +39,7 @@
<widget class="QTextEdit" name="textEdit"/> <widget class="QTextEdit" name="textEdit"/>
</item> </item>
</layout> </layout>
</item> </widget>
</layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources/> <resources/>