summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-09-17 15:22:00 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-09-17 15:22:00 (GMT)
commitb7923d48fb6d755d4563eeed0e7f3cbc774d69d5 (patch)
treeec8bb06f58f714d0b799164693e93bf0d51b6bcf /tools/designer
parente6dbbd0398d70ee64a3b8129e9621cfa15d70f8c (diff)
parenta62506aae40ede3fd8030312321759f669458909 (diff)
downloadQt-b7923d48fb6d755d4563eeed0e7f3cbc774d69d5.zip
Qt-b7923d48fb6d755d4563eeed0e7f3cbc774d69d5.tar.gz
Qt-b7923d48fb6d755d4563eeed0e7f3cbc774d69d5.tar.bz2
Merge branch '4.5' into 4.6
Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/src/components/formeditor/deviceprofiledialog.ui84
1 files changed, 46 insertions, 38 deletions
diff --git a/tools/designer/src/components/formeditor/deviceprofiledialog.ui b/tools/designer/src/components/formeditor/deviceprofiledialog.ui
index 3186c57..17ee966 100644
--- a/tools/designer/src/components/formeditor/deviceprofiledialog.ui
+++ b/tools/designer/src/components/formeditor/deviceprofiledialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
- <class>DeviceProfileDialog</class>
- <widget class="QDialog" name="dialog" >
- <property name="geometry" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dialog</class>
+ <widget class="QDialog" name="dialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,78 +10,78 @@
<height>209</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QWidget" native="1" name="SystemSettingsWidget" >
- <layout class="QFormLayout" name="formLayout" >
- <item row="1" column="0" >
- <widget class="QLabel" name="m_systemFontFamilyLabel" >
- <property name="text" >
+ <widget class="QWidget" name="SystemSettingsWidget" native="true">
+ <layout class="QFormLayout" name="formLayout">
+ <item row="1" column="0">
+ <widget class="QLabel" name="m_systemFontFamilyLabel">
+ <property name="text">
<string>&amp;Family</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>m_systemFontComboBox</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QFontComboBox" name="m_systemFontComboBox" />
+ <item row="1" column="1">
+ <widget class="QFontComboBox" name="m_systemFontComboBox"/>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="m_systemFontSizeLabel" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="m_systemFontSizeLabel">
+ <property name="text">
<string>&amp;Point Size</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>m_systemFontSizeCombo</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="m_systemFontSizeCombo" />
+ <item row="2" column="1">
+ <widget class="QComboBox" name="m_systemFontSizeCombo"/>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="m_styleLabel" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="m_styleLabel">
+ <property name="text">
<string>Style</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>m_styleCombo</cstring>
</property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QComboBox" name="m_styleCombo" />
+ <item row="3" column="1">
+ <widget class="QComboBox" name="m_styleCombo"/>
</item>
- <item row="4" column="0" >
- <widget class="QLabel" name="m_systemDPILabel" >
- <property name="text" >
+ <item row="4" column="0">
+ <widget class="QLabel" name="m_systemDPILabel">
+ <property name="text">
<string>Device DPI</string>
</property>
</widget>
</item>
- <item row="4" column="1" >
- <widget class="qdesigner_internal::DPI_Chooser" native="1" name="m_dpiChooser" />
+ <item row="4" column="1">
+ <widget class="qdesigner_internal::DPI_Chooser" name="m_dpiChooser" native="true"/>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="m_nameLabel" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="m_nameLabel">
+ <property name="text">
<string>Name</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="m_nameLineEdit" />
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="m_nameLineEdit"/>
</item>
</layout>
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
+ <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Open|QDialogButtonBox::Save</set>
</property>
</widget>
@@ -95,6 +96,13 @@
<container>1</container>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>m_nameLineEdit</tabstop>
+ <tabstop>m_systemFontComboBox</tabstop>
+ <tabstop>m_systemFontSizeCombo</tabstop>
+ <tabstop>m_styleCombo</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>