Initial import of statemachine branch from the old kinetic repository

201 files changed, 43848 insertions, 0 deletions

diff --git a/tests/auto/uic/baseline/.gitattributes b/tests/auto/uic/baseline/.gitattributes
new file mode 100644
index 0000000..4ea9d02
--- /dev/null
+++ b/tests/auto/uic/baseline/.gitattributes
@@ -0,0 +1 @@
+Widget.ui -crlf
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui
new file mode 100644
index 0000000..18d31ab
--- /dev/null
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui
@@ -0,0 +1,71 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <widget class="QDialogButtonBox" name="buttonBox" >
+   <property name="geometry" >
+    <rect>
+     <x>30</x>
+     <y>240</y>
+     <width>341</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons" >
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
new file mode 100644
index 0000000..6ce3579
--- /dev/null
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
@@ -0,0 +1,60 @@
+/********************************************************************************
+** Form generated from reading ui file 'Dialog_with_Buttons_Bottom.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef DIALOG_WITH_BUTTONS_BOTTOM_H
+#define DIALOG_WITH_BUTTONS_BOTTOM_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QHeaderView>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Dialog
+{
+public:
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *Dialog)
+    {
+        if (Dialog->objectName().isEmpty())
+            Dialog->setObjectName(QString::fromUtf8("Dialog"));
+        Dialog->resize(400, 300);
+        buttonBox = new QDialogButtonBox(Dialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setGeometry(QRect(30, 240, 341, 32));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        retranslateUi(Dialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(Dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *Dialog)
+    {
+        Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Dialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Dialog: public Ui_Dialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // DIALOG_WITH_BUTTONS_BOTTOM_H
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui
new file mode 100644
index 0000000..703d594
--- /dev/null
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui
@@ -0,0 +1,71 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <widget class="QDialogButtonBox" name="buttonBox" >
+   <property name="geometry" >
+    <rect>
+     <x>290</x>
+     <y>20</y>
+     <width>81</width>
+     <height>241</height>
+    </rect>
+   </property>
+   <property name="orientation" >
+    <enum>Qt::Vertical</enum>
+   </property>
+   <property name="standardButtons" >
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
new file mode 100644
index 0000000..a2a9078
--- /dev/null
+++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
@@ -0,0 +1,60 @@
+/********************************************************************************
+** Form generated from reading ui file 'Dialog_with_Buttons_Right.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef DIALOG_WITH_BUTTONS_RIGHT_H
+#define DIALOG_WITH_BUTTONS_RIGHT_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QHeaderView>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Dialog
+{
+public:
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *Dialog)
+    {
+        if (Dialog->objectName().isEmpty())
+            Dialog->setObjectName(QString::fromUtf8("Dialog"));
+        Dialog->resize(400, 300);
+        buttonBox = new QDialogButtonBox(Dialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setGeometry(QRect(290, 20, 81, 241));
+        buttonBox->setOrientation(Qt::Vertical);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        retranslateUi(Dialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(Dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *Dialog)
+    {
+        Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Dialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Dialog: public Ui_Dialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // DIALOG_WITH_BUTTONS_RIGHT_H
diff --git a/tests/auto/uic/baseline/Dialog_without_Buttons.ui b/tests/auto/uic/baseline/Dialog_without_Buttons.ui
new file mode 100644
index 0000000..1be6298
--- /dev/null
+++ b/tests/auto/uic/baseline/Dialog_without_Buttons.ui
@@ -0,0 +1,18 @@
+<ui version="4.0" >
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
new file mode 100644
index 0000000..d89bbef
--- /dev/null
+++ b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
@@ -0,0 +1,51 @@
+/********************************************************************************
+** Form generated from reading ui file 'Dialog_without_Buttons.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef DIALOG_WITHOUT_BUTTONS_H
+#define DIALOG_WITHOUT_BUTTONS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QHeaderView>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Dialog
+{
+public:
+
+    void setupUi(QDialog *Dialog)
+    {
+        if (Dialog->objectName().isEmpty())
+            Dialog->setObjectName(QString::fromUtf8("Dialog"));
+        Dialog->resize(400, 300);
+
+        retranslateUi(Dialog);
+
+        QMetaObject::connectSlotsByName(Dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *Dialog)
+    {
+        Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Dialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Dialog: public Ui_Dialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // DIALOG_WITHOUT_BUTTONS_H
diff --git a/tests/auto/uic/baseline/Main_Window.ui b/tests/auto/uic/baseline/Main_Window.ui
new file mode 100644
index 0000000..e324db8
--- /dev/null
+++ b/tests/auto/uic/baseline/Main_Window.ui
@@ -0,0 +1,27 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="objectName" >
+   <string notr="true" >MainWindow</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QMenuBar" name="menubar" />
+  <widget class="QWidget" name="centralwidget" />
+  <widget class="QStatusBar" name="statusbar" />
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/Main_Window.ui.h b/tests/auto/uic/baseline/Main_Window.ui.h
new file mode 100644
index 0000000..7404eca
--- /dev/null
+++ b/tests/auto/uic/baseline/Main_Window.ui.h
@@ -0,0 +1,66 @@
+/********************************************************************************
+** Form generated from reading ui file 'Main_Window.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef MAIN_WINDOW_H
+#define MAIN_WINDOW_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHeaderView>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenuBar>
+#include <QtGui/QStatusBar>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWindow
+{
+public:
+    QMenuBar *menubar;
+    QWidget *centralwidget;
+    QStatusBar *statusbar;
+
+    void setupUi(QMainWindow *MainWindow)
+    {
+        if (MainWindow->objectName().isEmpty())
+            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
+        MainWindow->resize(800, 600);
+        menubar = new QMenuBar(MainWindow);
+        menubar->setObjectName(QString::fromUtf8("menubar"));
+        MainWindow->setMenuBar(menubar);
+        centralwidget = new QWidget(MainWindow);
+        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
+        MainWindow->setCentralWidget(centralwidget);
+        statusbar = new QStatusBar(MainWindow);
+        statusbar->setObjectName(QString::fromUtf8("statusbar"));
+        MainWindow->setStatusBar(statusbar);
+
+        retranslateUi(MainWindow);
+
+        QMetaObject::connectSlotsByName(MainWindow);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *MainWindow)
+    {
+        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(MainWindow);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class MainWindow: public Ui_MainWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // MAIN_WINDOW_H
diff --git a/tests/auto/uic/baseline/Widget.ui b/tests/auto/uic/baseline/Widget.ui
new file mode 100644
index 0000000..ab94733
--- /dev/null
+++ b/tests/auto/uic/baseline/Widget.ui
@@ -0,0 +1,44 @@
+<ui version="4.0" >
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QLabel" name="Alabel" >
+     <property name="text" >
+      <string>A label.
+One new line.
+Another new line.

+Last line.</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>A Group Box</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="pushButton" >
+     <property name="text" >
+      <string>PushButton</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/Widget.ui.h b/tests/auto/uic/baseline/Widget.ui.h
new file mode 100644
index 0000000..a7a3198
--- /dev/null
+++ b/tests/auto/uic/baseline/Widget.ui.h
@@ -0,0 +1,82 @@
+/********************************************************************************
+** Form generated from reading ui file 'Widget.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef WIDGET_H
+#define WIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Form
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QLabel *Alabel;
+    QGroupBox *groupBox;
+    QPushButton *pushButton;
+
+    void setupUi(QWidget *Form)
+    {
+        if (Form->objectName().isEmpty())
+            Form->setObjectName(QString::fromUtf8("Form"));
+        Form->resize(400, 300);
+        vboxLayout = new QVBoxLayout(Form);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        Alabel = new QLabel(Form);
+        Alabel->setObjectName(QString::fromUtf8("Alabel"));
+
+        vboxLayout->addWidget(Alabel);
+
+        groupBox = new QGroupBox(Form);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+
+        vboxLayout->addWidget(groupBox);
+
+        pushButton = new QPushButton(Form);
+        pushButton->setObjectName(QString::fromUtf8("pushButton"));
+
+        vboxLayout->addWidget(pushButton);
+
+
+        retranslateUi(Form);
+
+        QMetaObject::connectSlotsByName(Form);
+    } // setupUi
+
+    void retranslateUi(QWidget *Form)
+    {
+        Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8));
+        Alabel->setText(QApplication::translate("Form", "A label.\n"
+"One new line.\n"
+"Another new line.\n"
+"Last line.", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("Form", "A Group Box", 0, QApplication::UnicodeUTF8));
+        pushButton->setText(QApplication::translate("Form", "PushButton", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Form);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Form: public Ui_Form {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // WIDGET_H
diff --git a/tests/auto/uic/baseline/addlinkdialog.ui b/tests/auto/uic/baseline/addlinkdialog.ui
new file mode 100644
index 0000000..3171159
--- /dev/null
+++ b/tests/auto/uic/baseline/addlinkdialog.ui
@@ -0,0 +1,112 @@
+<ui version="4.0" >
+ <class>AddLinkDialog</class>
+ <widget class="QDialog" name="AddLinkDialog" >
+  <property name="windowTitle" >
+   <string>Insert Link</string>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>false</bool>
+  </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <layout class="QFormLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Title:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="titleInput" >
+       <property name="minimumSize" >
+        <size>
+         <width>337</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>URL:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QLineEdit" name="urlInput" />
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AddLinkDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AddLinkDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/addlinkdialog.ui.h b/tests/auto/uic/baseline/addlinkdialog.ui.h
new file mode 100644
index 0000000..34caca9
--- /dev/null
+++ b/tests/auto/uic/baseline/addlinkdialog.ui.h
@@ -0,0 +1,118 @@
+/********************************************************************************
+** Form generated from reading ui file 'addlinkdialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef ADDLINKDIALOG_H
+#define ADDLINKDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QFrame>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_AddLinkDialog
+{
+public:
+    QVBoxLayout *verticalLayout;
+    QFormLayout *formLayout;
+    QLabel *label;
+    QLineEdit *titleInput;
+    QLabel *label_2;
+    QLineEdit *urlInput;
+    QSpacerItem *verticalSpacer;
+    QFrame *line;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *AddLinkDialog)
+    {
+        if (AddLinkDialog->objectName().isEmpty())
+            AddLinkDialog->setObjectName(QString::fromUtf8("AddLinkDialog"));
+        AddLinkDialog->setSizeGripEnabled(false);
+        AddLinkDialog->setModal(true);
+        verticalLayout = new QVBoxLayout(AddLinkDialog);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        formLayout = new QFormLayout();
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
+        label = new QLabel(AddLinkDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+
+        titleInput = new QLineEdit(AddLinkDialog);
+        titleInput->setObjectName(QString::fromUtf8("titleInput"));
+        titleInput->setMinimumSize(QSize(337, 0));
+
+        formLayout->setWidget(0, QFormLayout::FieldRole, titleInput);
+
+        label_2 = new QLabel(AddLinkDialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+
+        urlInput = new QLineEdit(AddLinkDialog);
+        urlInput->setObjectName(QString::fromUtf8("urlInput"));
+
+        formLayout->setWidget(1, QFormLayout::FieldRole, urlInput);
+
+
+        verticalLayout->addLayout(formLayout);
+
+        verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout->addItem(verticalSpacer);
+
+        line = new QFrame(AddLinkDialog);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        verticalLayout->addWidget(line);
+
+        buttonBox = new QDialogButtonBox(AddLinkDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        verticalLayout->addWidget(buttonBox);
+
+
+        retranslateUi(AddLinkDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), AddLinkDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), AddLinkDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(AddLinkDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *AddLinkDialog)
+    {
+        AddLinkDialog->setWindowTitle(QApplication::translate("AddLinkDialog", "Insert Link", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("AddLinkDialog", "Title:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("AddLinkDialog", "URL:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(AddLinkDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class AddLinkDialog: public Ui_AddLinkDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // ADDLINKDIALOG_H
diff --git a/tests/auto/uic/baseline/addtorrentform.ui b/tests/auto/uic/baseline/addtorrentform.ui
new file mode 100644
index 0000000..950bb67
--- /dev/null
+++ b/tests/auto/uic/baseline/addtorrentform.ui
@@ -0,0 +1,266 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>AddTorrentFile</class>
+ <widget class="QDialog" name="AddTorrentFile" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>464</width>
+    <height>385</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Add a torrent</string>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>false</bool>
+  </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Select a torrent source</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Destination:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QLineEdit" name="torrentFile" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Tracker URL:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QPushButton" name="browseTorrents" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+        <property name="default" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>File(s):</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Size:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_6" >
+        <property name="text" >
+         <string>Creator:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="3" >
+       <widget class="QTextEdit" name="torrentContents" >
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="tabChangesFocus" >
+         <bool>true</bool>
+        </property>
+        <property name="lineWrapMode" >
+         <enum>QTextEdit::NoWrap</enum>
+        </property>
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QLineEdit" name="destinationFolder" >
+        <property name="focusPolicy" >
+         <enum>Qt::StrongFocus</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLabel" name="announceUrl" >
+        <property name="text" >
+         <string>&lt;none></string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Torrent file:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="3" >
+       <widget class="QPushButton" name="browseDestination" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLabel" name="commentLabel" >
+        <property name="text" >
+         <string>&lt;none></string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLabel" name="creatorLabel" >
+        <property name="text" >
+         <string>&lt;none></string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="3" >
+       <widget class="QLabel" name="sizeLabel" >
+        <property name="text" >
+         <string>0</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+     <widget class="QWidget" name="widget" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>40</y>
+        <width>364</width>
+        <height>33</height>
+       </rect>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>131</width>
+         <height>31</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>torrentFile</tabstop>
+  <tabstop>browseTorrents</tabstop>
+  <tabstop>torrentContents</tabstop>
+  <tabstop>destinationFolder</tabstop>
+  <tabstop>browseDestination</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>
+   <receiver>AddTorrentFile</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>278</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>96</x>
+     <y>254</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>AddTorrentFile</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>369</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>179</x>
+     <y>282</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/addtorrentform.ui.h b/tests/auto/uic/baseline/addtorrentform.ui.h
new file mode 100644
index 0000000..35f0fad
--- /dev/null
+++ b/tests/auto/uic/baseline/addtorrentform.ui.h
@@ -0,0 +1,242 @@
+/********************************************************************************
+** Form generated from reading ui file 'addtorrentform.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef ADDTORRENTFORM_H
+#define ADDTORRENTFORM_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_AddTorrentFile
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QWidget *widget;
+    QGridLayout *gridLayout;
+    QLabel *label_4;
+    QLineEdit *torrentFile;
+    QLabel *label_2;
+    QPushButton *browseTorrents;
+    QLabel *label_5;
+    QLabel *label_3;
+    QLabel *label_6;
+    QTextEdit *torrentContents;
+    QLineEdit *destinationFolder;
+    QLabel *announceUrl;
+    QLabel *label;
+    QPushButton *browseDestination;
+    QLabel *label_7;
+    QLabel *commentLabel;
+    QLabel *creatorLabel;
+    QLabel *sizeLabel;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacerItem;
+    QPushButton *okButton;
+    QPushButton *cancelButton;
+
+    void setupUi(QDialog *AddTorrentFile)
+    {
+        if (AddTorrentFile->objectName().isEmpty())
+            AddTorrentFile->setObjectName(QString::fromUtf8("AddTorrentFile"));
+        AddTorrentFile->resize(464, 385);
+        AddTorrentFile->setSizeGripEnabled(false);
+        AddTorrentFile->setModal(true);
+        vboxLayout = new QVBoxLayout(AddTorrentFile);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(8);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(AddTorrentFile);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        widget = new QWidget(groupBox);
+        widget->setObjectName(QString::fromUtf8("widget"));
+        widget->setGeometry(QRect(10, 40, 364, 33));
+        gridLayout = new QGridLayout(groupBox);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+        gridLayout->setMargin(8);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label_4 = new QLabel(groupBox);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        gridLayout->addWidget(label_4, 6, 0, 1, 1);
+
+        torrentFile = new QLineEdit(groupBox);
+        torrentFile->setObjectName(QString::fromUtf8("torrentFile"));
+
+        gridLayout->addWidget(torrentFile, 0, 1, 1, 2);
+
+        label_2 = new QLabel(groupBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout->addWidget(label_2, 1, 0, 1, 1);
+
+        browseTorrents = new QPushButton(groupBox);
+        browseTorrents->setObjectName(QString::fromUtf8("browseTorrents"));
+        browseTorrents->setDefault(true);
+
+        gridLayout->addWidget(browseTorrents, 0, 3, 1, 1);
+
+        label_5 = new QLabel(groupBox);
+        label_5->setObjectName(QString::fromUtf8("label_5"));
+        label_5->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
+
+        gridLayout->addWidget(label_5, 5, 0, 1, 1);
+
+        label_3 = new QLabel(groupBox);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout->addWidget(label_3, 4, 0, 1, 1);
+
+        label_6 = new QLabel(groupBox);
+        label_6->setObjectName(QString::fromUtf8("label_6"));
+
+        gridLayout->addWidget(label_6, 2, 0, 1, 1);
+
+        torrentContents = new QTextEdit(groupBox);
+        torrentContents->setObjectName(QString::fromUtf8("torrentContents"));
+        torrentContents->setFocusPolicy(Qt::NoFocus);
+        torrentContents->setTabChangesFocus(true);
+        torrentContents->setLineWrapMode(QTextEdit::NoWrap);
+        torrentContents->setReadOnly(true);
+
+        gridLayout->addWidget(torrentContents, 5, 1, 1, 3);
+
+        destinationFolder = new QLineEdit(groupBox);
+        destinationFolder->setObjectName(QString::fromUtf8("destinationFolder"));
+        destinationFolder->setFocusPolicy(Qt::StrongFocus);
+
+        gridLayout->addWidget(destinationFolder, 6, 1, 1, 2);
+
+        announceUrl = new QLabel(groupBox);
+        announceUrl->setObjectName(QString::fromUtf8("announceUrl"));
+
+        gridLayout->addWidget(announceUrl, 1, 1, 1, 3);
+
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        browseDestination = new QPushButton(groupBox);
+        browseDestination->setObjectName(QString::fromUtf8("browseDestination"));
+
+        gridLayout->addWidget(browseDestination, 6, 3, 1, 1);
+
+        label_7 = new QLabel(groupBox);
+        label_7->setObjectName(QString::fromUtf8("label_7"));
+
+        gridLayout->addWidget(label_7, 3, 0, 1, 1);
+
+        commentLabel = new QLabel(groupBox);
+        commentLabel->setObjectName(QString::fromUtf8("commentLabel"));
+
+        gridLayout->addWidget(commentLabel, 3, 1, 1, 3);
+
+        creatorLabel = new QLabel(groupBox);
+        creatorLabel->setObjectName(QString::fromUtf8("creatorLabel"));
+
+        gridLayout->addWidget(creatorLabel, 2, 1, 1, 3);
+
+        sizeLabel = new QLabel(groupBox);
+        sizeLabel->setObjectName(QString::fromUtf8("sizeLabel"));
+
+        gridLayout->addWidget(sizeLabel, 4, 1, 1, 3);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+        okButton = new QPushButton(AddTorrentFile);
+        okButton->setObjectName(QString::fromUtf8("okButton"));
+        okButton->setEnabled(false);
+
+        hboxLayout->addWidget(okButton);
+
+        cancelButton = new QPushButton(AddTorrentFile);
+        cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
+
+        hboxLayout->addWidget(cancelButton);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        QWidget::setTabOrder(torrentFile, browseTorrents);
+        QWidget::setTabOrder(browseTorrents, torrentContents);
+        QWidget::setTabOrder(torrentContents, destinationFolder);
+        QWidget::setTabOrder(destinationFolder, browseDestination);
+        QWidget::setTabOrder(browseDestination, okButton);
+        QWidget::setTabOrder(okButton, cancelButton);
+
+        retranslateUi(AddTorrentFile);
+        QObject::connect(okButton, SIGNAL(clicked()), AddTorrentFile, SLOT(accept()));
+        QObject::connect(cancelButton, SIGNAL(clicked()), AddTorrentFile, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(AddTorrentFile);
+    } // setupUi
+
+    void retranslateUi(QDialog *AddTorrentFile)
+    {
+        AddTorrentFile->setWindowTitle(QApplication::translate("AddTorrentFile", "Add a torrent", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("AddTorrentFile", "Select a torrent source", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("AddTorrentFile", "Destination:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("AddTorrentFile", "Tracker URL:", 0, QApplication::UnicodeUTF8));
+        browseTorrents->setText(QApplication::translate("AddTorrentFile", "Browse", 0, QApplication::UnicodeUTF8));
+        label_5->setText(QApplication::translate("AddTorrentFile", "File(s):", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("AddTorrentFile", "Size:", 0, QApplication::UnicodeUTF8));
+        label_6->setText(QApplication::translate("AddTorrentFile", "Creator:", 0, QApplication::UnicodeUTF8));
+        announceUrl->setText(QApplication::translate("AddTorrentFile", "<none>", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("AddTorrentFile", "Torrent file:", 0, QApplication::UnicodeUTF8));
+        browseDestination->setText(QApplication::translate("AddTorrentFile", "Browse", 0, QApplication::UnicodeUTF8));
+        label_7->setText(QApplication::translate("AddTorrentFile", "Comment:", 0, QApplication::UnicodeUTF8));
+        commentLabel->setText(QApplication::translate("AddTorrentFile", "<none>", 0, QApplication::UnicodeUTF8));
+        creatorLabel->setText(QApplication::translate("AddTorrentFile", "<none>", 0, QApplication::UnicodeUTF8));
+        sizeLabel->setText(QApplication::translate("AddTorrentFile", "0", 0, QApplication::UnicodeUTF8));
+        okButton->setText(QApplication::translate("AddTorrentFile", "&OK", 0, QApplication::UnicodeUTF8));
+        cancelButton->setText(QApplication::translate("AddTorrentFile", "&Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(AddTorrentFile);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class AddTorrentFile: public Ui_AddTorrentFile {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // ADDTORRENTFORM_H
diff --git a/tests/auto/uic/baseline/authenticationdialog.ui b/tests/auto/uic/baseline/authenticationdialog.ui
new file mode 100644
index 0000000..82d908c
--- /dev/null
+++ b/tests/auto/uic/baseline/authenticationdialog.ui
@@ -0,0 +1,129 @@
+<ui version="4.0" >
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>389</width>
+    <height>243</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Http authentication required</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>You need to supply a Username and a Password to access this site</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="userEdit" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="passwordEdit" />
+   </item>
+   <item row="5" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Site:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLabel" name="siteDescription" >
+     <property name="font" >
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text" >
+      <string>%1 at %2</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/authenticationdialog.ui.h b/tests/auto/uic/baseline/authenticationdialog.ui.h
new file mode 100644
index 0000000..33acd91
--- /dev/null
+++ b/tests/auto/uic/baseline/authenticationdialog.ui.h
@@ -0,0 +1,127 @@
+/********************************************************************************
+** Form generated from reading ui file 'authenticationdialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef AUTHENTICATIONDIALOG_H
+#define AUTHENTICATIONDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Dialog
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QLabel *label_2;
+    QLineEdit *userEdit;
+    QLabel *label_3;
+    QLineEdit *passwordEdit;
+    QDialogButtonBox *buttonBox;
+    QLabel *label_4;
+    QLabel *siteDescription;
+    QSpacerItem *spacerItem;
+
+    void setupUi(QDialog *Dialog)
+    {
+        if (Dialog->objectName().isEmpty())
+            Dialog->setObjectName(QString::fromUtf8("Dialog"));
+        Dialog->resize(389, 243);
+        gridLayout = new QGridLayout(Dialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(Dialog);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setWordWrap(false);
+
+        gridLayout->addWidget(label, 0, 0, 1, 2);
+
+        label_2 = new QLabel(Dialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout->addWidget(label_2, 2, 0, 1, 1);
+
+        userEdit = new QLineEdit(Dialog);
+        userEdit->setObjectName(QString::fromUtf8("userEdit"));
+
+        gridLayout->addWidget(userEdit, 2, 1, 1, 1);
+
+        label_3 = new QLabel(Dialog);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout->addWidget(label_3, 3, 0, 1, 1);
+
+        passwordEdit = new QLineEdit(Dialog);
+        passwordEdit->setObjectName(QString::fromUtf8("passwordEdit"));
+
+        gridLayout->addWidget(passwordEdit, 3, 1, 1, 1);
+
+        buttonBox = new QDialogButtonBox(Dialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 5, 0, 1, 2);
+
+        label_4 = new QLabel(Dialog);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        gridLayout->addWidget(label_4, 1, 0, 1, 1);
+
+        siteDescription = new QLabel(Dialog);
+        siteDescription->setObjectName(QString::fromUtf8("siteDescription"));
+        QFont font;
+        font.setBold(true);
+        font.setWeight(75);
+        siteDescription->setFont(font);
+        siteDescription->setWordWrap(true);
+
+        gridLayout->addWidget(siteDescription, 1, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem, 4, 0, 1, 1);
+
+
+        retranslateUi(Dialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(Dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *Dialog)
+    {
+        Dialog->setWindowTitle(QApplication::translate("Dialog", "Http authentication required", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("Dialog", "You need to supply a Username and a Password to access this site", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("Dialog", "Username:", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("Dialog", "Password:", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("Dialog", "Site:", 0, QApplication::UnicodeUTF8));
+        siteDescription->setText(QApplication::translate("Dialog", "%1 at %2", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Dialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Dialog: public Ui_Dialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // AUTHENTICATIONDIALOG_H
diff --git a/tests/auto/uic/baseline/backside.ui b/tests/auto/uic/baseline/backside.ui
new file mode 100644
index 0000000..afa488c
--- /dev/null
+++ b/tests/auto/uic/baseline/backside.ui
@@ -0,0 +1,208 @@
+<ui version="4.0" >
+ <class>BackSide</class>
+ <widget class="QWidget" name="BackSide" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>378</width>
+    <height>385</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>BackSide</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Settings</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <property name="checkable" >
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="hostName" >
+        <property name="text" >
+         <string>Pad Navigator Example</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Modified:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Extent</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QSlider" name="horizontalSlider" >
+          <property name="value" >
+           <number>42</number>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBox" >
+          <property name="value" >
+           <number>42</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QDateTimeEdit" name="dateTimeEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Other input</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <property name="checkable" >
+      <bool>true</bool>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2" >
+      <item>
+       <widget class="QTreeWidget" name="treeWidget" >
+        <column>
+         <property name="text" >
+          <string>Widgets On Graphics View</string>
+         </property>
+        </column>
+        <item>
+         <property name="text" >
+          <string>QGraphicsProxyWidget</string>
+         </property>
+         <item>
+          <property name="text" >
+           <string>QGraphicsWidget</string>
+          </property>
+          <item>
+           <property name="text" >
+            <string>QObject</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>QGraphicsItem</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>QGraphicsLayoutItem</string>
+           </property>
+          </item>
+         </item>
+        </item>
+        <item>
+         <property name="text" >
+          <string>QGraphicsGridLayout</string>
+         </property>
+         <item>
+          <property name="text" >
+           <string>QGraphicsLayout</string>
+          </property>
+          <item>
+           <property name="text" >
+            <string>QGraphicsLayoutItem</string>
+           </property>
+          </item>
+         </item>
+        </item>
+        <item>
+         <property name="text" >
+          <string>QGraphicsLinearLayout</string>
+         </property>
+         <item>
+          <property name="text" >
+           <string>QGraphicsLayout</string>
+          </property>
+          <item>
+           <property name="text" >
+            <string>QGraphicsLayoutItem</string>
+           </property>
+          </item>
+         </item>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>groupBox</tabstop>
+  <tabstop>hostName</tabstop>
+  <tabstop>dateTimeEdit</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>groupBox_2</tabstop>
+  <tabstop>treeWidget</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>horizontalSlider</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>spinBox</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>184</x>
+     <y>125</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>275</x>
+     <y>127</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>spinBox</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalSlider</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>272</x>
+     <y>114</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>190</x>
+     <y>126</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/backside.ui.h b/tests/auto/uic/baseline/backside.ui.h
new file mode 100644
index 0000000..7cc5ee9
--- /dev/null
+++ b/tests/auto/uic/baseline/backside.ui.h
@@ -0,0 +1,197 @@
+/********************************************************************************
+** Form generated from reading ui file 'backside.ui'
+**
+** Created: Tue Jun 17 09:18:47 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef BACKSIDE_H
+#define BACKSIDE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDateTimeEdit>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSlider>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_BackSide
+{
+public:
+    QVBoxLayout *verticalLayout_2;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QLineEdit *hostName;
+    QLabel *label_2;
+    QLabel *label_3;
+    QHBoxLayout *horizontalLayout;
+    QSlider *horizontalSlider;
+    QSpinBox *spinBox;
+    QDateTimeEdit *dateTimeEdit;
+    QGroupBox *groupBox_2;
+    QHBoxLayout *horizontalLayout_2;
+    QTreeWidget *treeWidget;
+
+    void setupUi(QWidget *BackSide)
+    {
+        if (BackSide->objectName().isEmpty())
+            BackSide->setObjectName(QString::fromUtf8("BackSide"));
+        BackSide->resize(378, 385);
+        verticalLayout_2 = new QVBoxLayout(BackSide);
+        verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
+        groupBox = new QGroupBox(BackSide);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        groupBox->setFlat(true);
+        groupBox->setCheckable(true);
+        gridLayout = new QGridLayout(groupBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        hostName = new QLineEdit(groupBox);
+        hostName->setObjectName(QString::fromUtf8("hostName"));
+
+        gridLayout->addWidget(hostName, 0, 1, 1, 1);
+
+        label_2 = new QLabel(groupBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout->addWidget(label_2, 1, 0, 1, 1);
+
+        label_3 = new QLabel(groupBox);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout->addWidget(label_3, 2, 0, 1, 1);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        horizontalSlider = new QSlider(groupBox);
+        horizontalSlider->setObjectName(QString::fromUtf8("horizontalSlider"));
+        horizontalSlider->setValue(42);
+        horizontalSlider->setOrientation(Qt::Horizontal);
+
+        horizontalLayout->addWidget(horizontalSlider);
+
+        spinBox = new QSpinBox(groupBox);
+        spinBox->setObjectName(QString::fromUtf8("spinBox"));
+        spinBox->setValue(42);
+
+        horizontalLayout->addWidget(spinBox);
+
+
+        gridLayout->addLayout(horizontalLayout, 2, 1, 1, 1);
+
+        dateTimeEdit = new QDateTimeEdit(groupBox);
+        dateTimeEdit->setObjectName(QString::fromUtf8("dateTimeEdit"));
+
+        gridLayout->addWidget(dateTimeEdit, 1, 1, 1, 1);
+
+
+        verticalLayout_2->addWidget(groupBox);
+
+        groupBox_2 = new QGroupBox(BackSide);
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        groupBox_2->setFlat(true);
+        groupBox_2->setCheckable(true);
+        horizontalLayout_2 = new QHBoxLayout(groupBox_2);
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        treeWidget = new QTreeWidget(groupBox_2);
+        QTreeWidgetItem *__qtreewidgetitem = new QTreeWidgetItem(treeWidget);
+        QTreeWidgetItem *__qtreewidgetitem1 = new QTreeWidgetItem(__qtreewidgetitem);
+        new QTreeWidgetItem(__qtreewidgetitem1);
+        new QTreeWidgetItem(__qtreewidgetitem1);
+        new QTreeWidgetItem(__qtreewidgetitem1);
+        QTreeWidgetItem *__qtreewidgetitem2 = new QTreeWidgetItem(treeWidget);
+        QTreeWidgetItem *__qtreewidgetitem3 = new QTreeWidgetItem(__qtreewidgetitem2);
+        new QTreeWidgetItem(__qtreewidgetitem3);
+        QTreeWidgetItem *__qtreewidgetitem4 = new QTreeWidgetItem(treeWidget);
+        QTreeWidgetItem *__qtreewidgetitem5 = new QTreeWidgetItem(__qtreewidgetitem4);
+        new QTreeWidgetItem(__qtreewidgetitem5);
+        treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
+
+        horizontalLayout_2->addWidget(treeWidget);
+
+
+        verticalLayout_2->addWidget(groupBox_2);
+
+        QWidget::setTabOrder(groupBox, hostName);
+        QWidget::setTabOrder(hostName, dateTimeEdit);
+        QWidget::setTabOrder(dateTimeEdit, horizontalSlider);
+        QWidget::setTabOrder(horizontalSlider, spinBox);
+        QWidget::setTabOrder(spinBox, groupBox_2);
+        QWidget::setTabOrder(groupBox_2, treeWidget);
+
+        retranslateUi(BackSide);
+        QObject::connect(horizontalSlider, SIGNAL(valueChanged(int)), spinBox, SLOT(setValue(int)));
+        QObject::connect(spinBox, SIGNAL(valueChanged(int)), horizontalSlider, SLOT(setValue(int)));
+
+        QMetaObject::connectSlotsByName(BackSide);
+    } // setupUi
+
+    void retranslateUi(QWidget *BackSide)
+    {
+        BackSide->setWindowTitle(QApplication::translate("BackSide", "BackSide", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("BackSide", "Settings", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("BackSide", "Title:", 0, QApplication::UnicodeUTF8));
+        hostName->setText(QApplication::translate("BackSide", "Pad Navigator Example", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("BackSide", "Modified:", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("BackSide", "Extent", 0, QApplication::UnicodeUTF8));
+        groupBox_2->setTitle(QApplication::translate("BackSide", "Other input", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("BackSide", "Widgets On Graphics View", 0, QApplication::UnicodeUTF8));
+
+        const bool __sortingEnabled = treeWidget->isSortingEnabled();
+        treeWidget->setSortingEnabled(false);
+        QTreeWidgetItem *___qtreewidgetitem1 = treeWidget->topLevelItem(0);
+        ___qtreewidgetitem1->setText(0, QApplication::translate("BackSide", "QGraphicsProxyWidget", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem2 = ___qtreewidgetitem1->child(0);
+        ___qtreewidgetitem2->setText(0, QApplication::translate("BackSide", "QGraphicsWidget", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem3 = ___qtreewidgetitem2->child(0);
+        ___qtreewidgetitem3->setText(0, QApplication::translate("BackSide", "QObject", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem4 = ___qtreewidgetitem2->child(1);
+        ___qtreewidgetitem4->setText(0, QApplication::translate("BackSide", "QGraphicsItem", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem5 = ___qtreewidgetitem2->child(2);
+        ___qtreewidgetitem5->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem6 = treeWidget->topLevelItem(1);
+        ___qtreewidgetitem6->setText(0, QApplication::translate("BackSide", "QGraphicsGridLayout", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem7 = ___qtreewidgetitem6->child(0);
+        ___qtreewidgetitem7->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem8 = ___qtreewidgetitem7->child(0);
+        ___qtreewidgetitem8->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem9 = treeWidget->topLevelItem(2);
+        ___qtreewidgetitem9->setText(0, QApplication::translate("BackSide", "QGraphicsLinearLayout", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem10 = ___qtreewidgetitem9->child(0);
+        ___qtreewidgetitem10->setText(0, QApplication::translate("BackSide", "QGraphicsLayout", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem11 = ___qtreewidgetitem10->child(0);
+        ___qtreewidgetitem11->setText(0, QApplication::translate("BackSide", "QGraphicsLayoutItem", 0, QApplication::UnicodeUTF8));
+        treeWidget->setSortingEnabled(__sortingEnabled);
+
+        Q_UNUSED(BackSide);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class BackSide: public Ui_BackSide {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // BACKSIDE_H
diff --git a/tests/auto/uic/baseline/batchtranslation.ui b/tests/auto/uic/baseline/batchtranslation.ui
new file mode 100644
index 0000000..e351ec4
--- /dev/null
+++ b/tests/auto/uic/baseline/batchtranslation.ui
@@ -0,0 +1,235 @@
+<ui version="4.0" >
+ <author></author>
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <exportmacro></exportmacro>
+ <class>databaseTranslationDialog</class>
+ <widget class="QDialog" name="databaseTranslationDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>425</width>
+    <height>370</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt Linguist - Batch Translation</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>4</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Options</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="ckOnlyUntranslated" >
+        <property name="text" >
+         <string>Only translate entries with no translation</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="ckMarkFinished" >
+        <property name="text" >
+         <string>Set translated entries to finished</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>1</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Phrase book preference</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QListView" name="phrasebookList" >
+          <property name="uniformItemSizes" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>0</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QPushButton" name="moveUpButton" >
+            <property name="text" >
+             <string>Move up</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="moveDownButton" >
+            <property name="text" >
+             <string>Move down</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>The batch translator will search through the selected phrasebooks in the order given above.</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="runButton" >
+       <property name="text" >
+        <string>&amp;Run</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/uic/baseline/batchtranslation.ui.h
new file mode 100644
index 0000000..23030f5
--- /dev/null
+++ b/tests/auto/uic/baseline/batchtranslation.ui.h
@@ -0,0 +1,253 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'batchtranslation.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef BATCHTRANSLATION_H
+#define BATCHTRANSLATION_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QDialog>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_databaseTranslationDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QVBoxLayout *vboxLayout1;
+    QCheckBox *ckOnlyUntranslated;
+    QCheckBox *ckMarkFinished;
+    QGroupBox *groupBox_2;
+    QVBoxLayout *vboxLayout2;
+    QHBoxLayout *hboxLayout;
+    QListView *phrasebookList;
+    QVBoxLayout *vboxLayout3;
+    QPushButton *moveUpButton;
+    QPushButton *moveDownButton;
+    QSpacerItem *spacerItem;
+    QLabel *label;
+    QHBoxLayout *hboxLayout1;
+    QSpacerItem *spacerItem1;
+    QPushButton *runButton;
+    QPushButton *cancelButton;
+
+    void setupUi(QDialog *databaseTranslationDialog)
+    {
+        if (databaseTranslationDialog->objectName().isEmpty())
+            databaseTranslationDialog->setObjectName(QString::fromUtf8("databaseTranslationDialog"));
+        databaseTranslationDialog->resize(425, 370);
+        vboxLayout = new QVBoxLayout(databaseTranslationDialog);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(databaseTranslationDialog);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(4));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth());
+        groupBox->setSizePolicy(sizePolicy);
+        vboxLayout1 = new QVBoxLayout(groupBox);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(9);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        ckOnlyUntranslated = new QCheckBox(groupBox);
+        ckOnlyUntranslated->setObjectName(QString::fromUtf8("ckOnlyUntranslated"));
+        ckOnlyUntranslated->setChecked(true);
+
+        vboxLayout1->addWidget(ckOnlyUntranslated);
+
+        ckMarkFinished = new QCheckBox(groupBox);
+        ckMarkFinished->setObjectName(QString::fromUtf8("ckMarkFinished"));
+        ckMarkFinished->setChecked(true);
+
+        vboxLayout1->addWidget(ckMarkFinished);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        groupBox_2 = new QGroupBox(databaseTranslationDialog);
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(1));
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(groupBox_2->sizePolicy().hasHeightForWidth());
+        groupBox_2->setSizePolicy(sizePolicy1);
+        vboxLayout2 = new QVBoxLayout(groupBox_2);
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout2->setMargin(9);
+#endif
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(0);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        phrasebookList = new QListView(groupBox_2);
+        phrasebookList->setObjectName(QString::fromUtf8("phrasebookList"));
+        phrasebookList->setUniformItemSizes(true);
+
+        hboxLayout->addWidget(phrasebookList);
+
+        vboxLayout3 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout3->setSpacing(6);
+#endif
+        vboxLayout3->setMargin(0);
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        moveUpButton = new QPushButton(groupBox_2);
+        moveUpButton->setObjectName(QString::fromUtf8("moveUpButton"));
+
+        vboxLayout3->addWidget(moveUpButton);
+
+        moveDownButton = new QPushButton(groupBox_2);
+        moveDownButton->setObjectName(QString::fromUtf8("moveDownButton"));
+
+        vboxLayout3->addWidget(moveDownButton);
+
+        spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout3->addItem(spacerItem);
+
+
+        hboxLayout->addLayout(vboxLayout3);
+
+
+        vboxLayout2->addLayout(hboxLayout);
+
+        label = new QLabel(groupBox_2);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setWordWrap(true);
+
+        vboxLayout2->addWidget(label);
+
+
+        vboxLayout->addWidget(groupBox_2);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem1);
+
+        runButton = new QPushButton(databaseTranslationDialog);
+        runButton->setObjectName(QString::fromUtf8("runButton"));
+
+        hboxLayout1->addWidget(runButton);
+
+        cancelButton = new QPushButton(databaseTranslationDialog);
+        cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
+
+        hboxLayout1->addWidget(cancelButton);
+
+
+        vboxLayout->addLayout(hboxLayout1);
+
+
+        retranslateUi(databaseTranslationDialog);
+
+        QMetaObject::connectSlotsByName(databaseTranslationDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *databaseTranslationDialog)
+    {
+        databaseTranslationDialog->setWindowTitle(QApplication::translate("databaseTranslationDialog", "Qt Linguist - Batch Translation", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("databaseTranslationDialog", "Options", 0, QApplication::UnicodeUTF8));
+        ckOnlyUntranslated->setText(QApplication::translate("databaseTranslationDialog", "Only translate entries with no translation", 0, QApplication::UnicodeUTF8));
+        ckMarkFinished->setText(QApplication::translate("databaseTranslationDialog", "Set translated entries to finished", 0, QApplication::UnicodeUTF8));
+        groupBox_2->setTitle(QApplication::translate("databaseTranslationDialog", "Phrase book preference", 0, QApplication::UnicodeUTF8));
+        moveUpButton->setText(QApplication::translate("databaseTranslationDialog", "Move up", 0, QApplication::UnicodeUTF8));
+        moveDownButton->setText(QApplication::translate("databaseTranslationDialog", "Move down", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("databaseTranslationDialog", "The batch translator will search through the selected phrasebooks in the order given above.", 0, QApplication::UnicodeUTF8));
+        runButton->setText(QApplication::translate("databaseTranslationDialog", "&Run", 0, QApplication::UnicodeUTF8));
+        cancelButton->setText(QApplication::translate("databaseTranslationDialog", "&Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(databaseTranslationDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class databaseTranslationDialog: public Ui_databaseTranslationDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // BATCHTRANSLATION_H
diff --git a/tests/auto/uic/baseline/bookmarkdialog.ui b/tests/auto/uic/baseline/bookmarkdialog.ui
new file mode 100644
index 0000000..2d6470c
--- /dev/null
+++ b/tests/auto/uic/baseline/bookmarkdialog.ui
@@ -0,0 +1,161 @@
+<ui version="4.0" >
+ <class>BookmarkDialog</class>
+ <widget class="QDialog" name="BookmarkDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>450</width>
+    <height>135</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Add Bookmark</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3" >
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2" >
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Bookmark:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Add in Folder:</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout" >
+       <item>
+        <widget class="QLineEdit" name="bookmarkEdit" />
+       </item>
+       <item>
+        <widget class="QComboBox" name="bookmarkFolders" />
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3" >
+     <item>
+      <widget class="QToolButton" name="toolButton" >
+       <property name="minimumSize" >
+        <size>
+         <width>25</width>
+         <height>20</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string>+</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="Line" name="line" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="BookmarkWidget" name="bookmarkWidget" >
+     <property name="enabled" >
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Ignored" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <column>
+      <property name="text" >
+       <string>1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4" >
+     <item>
+      <widget class="QPushButton" name="newFolderButton" >
+       <property name="text" >
+        <string>New Folder</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BookmarkWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>bookmarkwidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>BookmarkDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>BookmarkDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/bookmarkdialog.ui.h b/tests/auto/uic/baseline/bookmarkdialog.ui.h
new file mode 100644
index 0000000..b5af0cf
--- /dev/null
+++ b/tests/auto/uic/baseline/bookmarkdialog.ui.h
@@ -0,0 +1,172 @@
+/********************************************************************************
+** Form generated from reading ui file 'bookmarkdialog.ui'
+**
+** Created: Mon Jun 16 18:01:55 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef BOOKMARKDIALOG_H
+#define BOOKMARKDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include "bookmarkwidget.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_BookmarkDialog
+{
+public:
+    QVBoxLayout *verticalLayout_3;
+    QHBoxLayout *horizontalLayout;
+    QVBoxLayout *verticalLayout_2;
+    QLabel *label;
+    QLabel *label_2;
+    QVBoxLayout *verticalLayout;
+    QLineEdit *bookmarkEdit;
+    QComboBox *bookmarkFolders;
+    QHBoxLayout *horizontalLayout_3;
+    QToolButton *toolButton;
+    QFrame *line;
+    BookmarkWidget *bookmarkWidget;
+    QHBoxLayout *horizontalLayout_4;
+    QPushButton *newFolderButton;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *BookmarkDialog)
+    {
+        if (BookmarkDialog->objectName().isEmpty())
+            BookmarkDialog->setObjectName(QString::fromUtf8("BookmarkDialog"));
+        BookmarkDialog->resize(450, 135);
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(BookmarkDialog->sizePolicy().hasHeightForWidth());
+        BookmarkDialog->setSizePolicy(sizePolicy);
+        verticalLayout_3 = new QVBoxLayout(BookmarkDialog);
+        verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        verticalLayout_2 = new QVBoxLayout();
+        verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
+        label = new QLabel(BookmarkDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        verticalLayout_2->addWidget(label);
+
+        label_2 = new QLabel(BookmarkDialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        verticalLayout_2->addWidget(label_2);
+
+
+        horizontalLayout->addLayout(verticalLayout_2);
+
+        verticalLayout = new QVBoxLayout();
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        bookmarkEdit = new QLineEdit(BookmarkDialog);
+        bookmarkEdit->setObjectName(QString::fromUtf8("bookmarkEdit"));
+
+        verticalLayout->addWidget(bookmarkEdit);
+
+        bookmarkFolders = new QComboBox(BookmarkDialog);
+        bookmarkFolders->setObjectName(QString::fromUtf8("bookmarkFolders"));
+
+        verticalLayout->addWidget(bookmarkFolders);
+
+
+        horizontalLayout->addLayout(verticalLayout);
+
+
+        verticalLayout_3->addLayout(horizontalLayout);
+
+        horizontalLayout_3 = new QHBoxLayout();
+        horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
+        toolButton = new QToolButton(BookmarkDialog);
+        toolButton->setObjectName(QString::fromUtf8("toolButton"));
+        toolButton->setMinimumSize(QSize(25, 20));
+
+        horizontalLayout_3->addWidget(toolButton);
+
+        line = new QFrame(BookmarkDialog);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        horizontalLayout_3->addWidget(line);
+
+
+        verticalLayout_3->addLayout(horizontalLayout_3);
+
+        bookmarkWidget = new BookmarkWidget(BookmarkDialog);
+        bookmarkWidget->setObjectName(QString::fromUtf8("bookmarkWidget"));
+        bookmarkWidget->setEnabled(true);
+        QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Ignored);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(bookmarkWidget->sizePolicy().hasHeightForWidth());
+        bookmarkWidget->setSizePolicy(sizePolicy1);
+
+        verticalLayout_3->addWidget(bookmarkWidget);
+
+        horizontalLayout_4 = new QHBoxLayout();
+        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
+        newFolderButton = new QPushButton(BookmarkDialog);
+        newFolderButton->setObjectName(QString::fromUtf8("newFolderButton"));
+
+        horizontalLayout_4->addWidget(newFolderButton);
+
+        buttonBox = new QDialogButtonBox(BookmarkDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        horizontalLayout_4->addWidget(buttonBox);
+
+
+        verticalLayout_3->addLayout(horizontalLayout_4);
+
+
+        retranslateUi(BookmarkDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), BookmarkDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), BookmarkDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(BookmarkDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *BookmarkDialog)
+    {
+        BookmarkDialog->setWindowTitle(QApplication::translate("BookmarkDialog", "Add Bookmark", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("BookmarkDialog", "Bookmark:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("BookmarkDialog", "Add in Folder:", 0, QApplication::UnicodeUTF8));
+        toolButton->setText(QApplication::translate("BookmarkDialog", "+", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = bookmarkWidget->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("BookmarkDialog", "1", 0, QApplication::UnicodeUTF8));
+        newFolderButton->setText(QApplication::translate("BookmarkDialog", "New Folder", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(BookmarkDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class BookmarkDialog: public Ui_BookmarkDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // BOOKMARKDIALOG_H
diff --git a/tests/auto/uic/baseline/bookwindow.ui b/tests/auto/uic/baseline/bookwindow.ui
new file mode 100644
index 0000000..659d324
--- /dev/null
+++ b/tests/auto/uic/baseline/bookwindow.ui
@@ -0,0 +1,149 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>BookWindow</class>
+ <widget class="QMainWindow" name="BookWindow" >
+ <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>601</width>
+    <height>420</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Books</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QGroupBox" name="groupBox" >
+      <property name="title" >
+       <string>Books</string>
+      </property>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QTableView" name="bookTable" >
+         <property name="selectionBehavior" >
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2" >
+         <property name="title" >
+          <string>Details</string>
+         </property>
+         <layout class="QFormLayout" >
+	   <item row="0" column="0" >
+           <widget class="QLabel" name="label_5" >
+            <property name="text" >
+             <string>&lt;b>Title:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="titleEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_2_2_2_2" >
+            <property name="text" >
+             <string>&lt;b>Author: &lt;/b></string>
+            </property>
+           </widget>
+	    </item>
+	     <item row="1" column="1" >
+           <widget class="QComboBox" name="authorEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>	   
+	  <item row="2" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
+             <string>&lt;b>Genre:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QComboBox" name="genreEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_4" >
+            <property name="text" >
+             <string>&lt;b>Year:&lt;/b></string>
+            </property>
+           </widget>
+          </item>       
+          <item row="3" column="1" >
+           <widget class="QSpinBox" name="yearEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+            <property name="prefix" >
+             <string/>
+            </property>
+            <property name="maximum" >
+             <number>2100</number>
+            </property>
+            <property name="minimum" >
+             <number>-1000</number>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>&lt;b>Rating:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" >
+           <widget class="QSpinBox" name="ratingEdit" >
+            <property name="maximum" >
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>bookTable</tabstop>
+  <tabstop>titleEdit</tabstop>
+  <tabstop>authorEdit</tabstop>
+  <tabstop>genreEdit</tabstop>
+  <tabstop>yearEdit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/bookwindow.ui.h b/tests/auto/uic/baseline/bookwindow.ui.h
new file mode 100644
index 0000000..9eff8ce
--- /dev/null
+++ b/tests/auto/uic/baseline/bookwindow.ui.h
@@ -0,0 +1,183 @@
+/********************************************************************************
+** Form generated from reading ui file 'bookwindow.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef BOOKWINDOW_H
+#define BOOKWINDOW_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMainWindow>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTableView>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_BookWindow
+{
+public:
+    QWidget *centralWidget;
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QVBoxLayout *vboxLayout1;
+    QTableView *bookTable;
+    QGroupBox *groupBox_2;
+    QFormLayout *formLayout;
+    QLabel *label_5;
+    QLineEdit *titleEdit;
+    QLabel *label_2_2_2_2;
+    QComboBox *authorEdit;
+    QLabel *label_3;
+    QComboBox *genreEdit;
+    QLabel *label_4;
+    QSpinBox *yearEdit;
+    QLabel *label;
+    QSpinBox *ratingEdit;
+
+    void setupUi(QMainWindow *BookWindow)
+    {
+        if (BookWindow->objectName().isEmpty())
+            BookWindow->setObjectName(QString::fromUtf8("BookWindow"));
+        BookWindow->resize(601, 420);
+        centralWidget = new QWidget(BookWindow);
+        centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
+        vboxLayout = new QVBoxLayout(centralWidget);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(centralWidget);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        vboxLayout1 = new QVBoxLayout(groupBox);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(9);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        bookTable = new QTableView(groupBox);
+        bookTable->setObjectName(QString::fromUtf8("bookTable"));
+        bookTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+
+        vboxLayout1->addWidget(bookTable);
+
+        groupBox_2 = new QGroupBox(groupBox);
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        formLayout = new QFormLayout(groupBox_2);
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
+        label_5 = new QLabel(groupBox_2);
+        label_5->setObjectName(QString::fromUtf8("label_5"));
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, label_5);
+
+        titleEdit = new QLineEdit(groupBox_2);
+        titleEdit->setObjectName(QString::fromUtf8("titleEdit"));
+        titleEdit->setEnabled(true);
+
+        formLayout->setWidget(0, QFormLayout::FieldRole, titleEdit);
+
+        label_2_2_2_2 = new QLabel(groupBox_2);
+        label_2_2_2_2->setObjectName(QString::fromUtf8("label_2_2_2_2"));
+
+        formLayout->setWidget(1, QFormLayout::LabelRole, label_2_2_2_2);
+
+        authorEdit = new QComboBox(groupBox_2);
+        authorEdit->setObjectName(QString::fromUtf8("authorEdit"));
+        authorEdit->setEnabled(true);
+
+        formLayout->setWidget(1, QFormLayout::FieldRole, authorEdit);
+
+        label_3 = new QLabel(groupBox_2);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        formLayout->setWidget(2, QFormLayout::LabelRole, label_3);
+
+        genreEdit = new QComboBox(groupBox_2);
+        genreEdit->setObjectName(QString::fromUtf8("genreEdit"));
+        genreEdit->setEnabled(true);
+
+        formLayout->setWidget(2, QFormLayout::FieldRole, genreEdit);
+
+        label_4 = new QLabel(groupBox_2);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        formLayout->setWidget(3, QFormLayout::LabelRole, label_4);
+
+        yearEdit = new QSpinBox(groupBox_2);
+        yearEdit->setObjectName(QString::fromUtf8("yearEdit"));
+        yearEdit->setEnabled(true);
+        yearEdit->setMaximum(2100);
+        yearEdit->setMinimum(-1000);
+
+        formLayout->setWidget(3, QFormLayout::FieldRole, yearEdit);
+
+        label = new QLabel(groupBox_2);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        formLayout->setWidget(4, QFormLayout::LabelRole, label);
+
+        ratingEdit = new QSpinBox(groupBox_2);
+        ratingEdit->setObjectName(QString::fromUtf8("ratingEdit"));
+        ratingEdit->setMaximum(5);
+
+        formLayout->setWidget(4, QFormLayout::FieldRole, ratingEdit);
+
+
+        vboxLayout1->addWidget(groupBox_2);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        BookWindow->setCentralWidget(centralWidget);
+        QWidget::setTabOrder(bookTable, titleEdit);
+        QWidget::setTabOrder(titleEdit, authorEdit);
+        QWidget::setTabOrder(authorEdit, genreEdit);
+        QWidget::setTabOrder(genreEdit, yearEdit);
+
+        retranslateUi(BookWindow);
+
+        QMetaObject::connectSlotsByName(BookWindow);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *BookWindow)
+    {
+        BookWindow->setWindowTitle(QApplication::translate("BookWindow", "Books", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("BookWindow", "Books", 0, QApplication::UnicodeUTF8));
+        groupBox_2->setTitle(QApplication::translate("BookWindow", "Details", 0, QApplication::UnicodeUTF8));
+        label_5->setText(QApplication::translate("BookWindow", "<b>Title:</b>", 0, QApplication::UnicodeUTF8));
+        label_2_2_2_2->setText(QApplication::translate("BookWindow", "<b>Author: </b>", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("BookWindow", "<b>Genre:</b>", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("BookWindow", "<b>Year:</b>", 0, QApplication::UnicodeUTF8));
+        yearEdit->setPrefix(QString());
+        label->setText(QApplication::translate("BookWindow", "<b>Rating:</b>", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(BookWindow);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class BookWindow: public Ui_BookWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // BOOKWINDOW_H
diff --git a/tests/auto/uic/baseline/browserwidget.ui b/tests/auto/uic/baseline/browserwidget.ui
new file mode 100644
index 0000000..20946f0
--- /dev/null
+++ b/tests/auto/uic/baseline/browserwidget.ui
@@ -0,0 +1,199 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Browser</class>
+ <widget class="QWidget" name="Browser" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>765</width>
+    <height>515</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt SQL Browser</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QSplitter" name="splitter_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="ConnectionWidget" name="connectionWidget" >
+      <property name="sizePolicy" >
+       <sizepolicy>
+        <hsizetype>13</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+     <widget class="QTableView" name="table" >
+      <property name="sizePolicy" >
+       <sizepolicy>
+        <hsizetype>7</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>2</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="contextMenuPolicy" >
+       <enum>Qt::ActionsContextMenu</enum>
+      </property>
+      <property name="selectionBehavior" >
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>3</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>180</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>SQL Query</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QTextEdit" name="sqlEdit" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>3</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>18</height>
+         </size>
+        </property>
+        <property name="baseSize" >
+         <size>
+          <width>0</width>
+          <height>120</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>1</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="clearButton" >
+          <property name="text" >
+           <string>&amp;Clear</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="submitButton" >
+          <property name="text" >
+           <string>&amp;Submit</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+  <action name="insertRowAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Insert Row</string>
+   </property>
+   <property name="statusTip" >
+    <string>Inserts a new Row</string>
+   </property>
+  </action>
+  <action name="deleteRowAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Delete Row</string>
+   </property>
+   <property name="statusTip" >
+    <string>Deletes the current Row</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>ConnectionWidget</class>
+   <extends>QTreeView</extends>
+   <header>connectionwidget.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>sqlEdit</tabstop>
+  <tabstop>clearButton</tabstop>
+  <tabstop>submitButton</tabstop>
+  <tabstop>connectionWidget</tabstop>
+  <tabstop>table</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/browserwidget.ui.h b/tests/auto/uic/baseline/browserwidget.ui.h
new file mode 100644
index 0000000..3bc7542
--- /dev/null
+++ b/tests/auto/uic/baseline/browserwidget.ui.h
@@ -0,0 +1,183 @@
+/********************************************************************************
+** Form generated from reading ui file 'browserwidget.ui'
+**
+** Created: Mon Jun 16 18:01:09 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef BROWSERWIDGET_H
+#define BROWSERWIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSplitter>
+#include <QtGui/QTableView>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "connectionwidget.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Browser
+{
+public:
+    QAction *insertRowAction;
+    QAction *deleteRowAction;
+    QVBoxLayout *vboxLayout;
+    QSplitter *splitter_2;
+    ConnectionWidget *connectionWidget;
+    QTableView *table;
+    QGroupBox *groupBox;
+    QVBoxLayout *vboxLayout1;
+    QTextEdit *sqlEdit;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacerItem;
+    QPushButton *clearButton;
+    QPushButton *submitButton;
+
+    void setupUi(QWidget *Browser)
+    {
+        if (Browser->objectName().isEmpty())
+            Browser->setObjectName(QString::fromUtf8("Browser"));
+        Browser->resize(765, 515);
+        insertRowAction = new QAction(Browser);
+        insertRowAction->setObjectName(QString::fromUtf8("insertRowAction"));
+        insertRowAction->setEnabled(false);
+        deleteRowAction = new QAction(Browser);
+        deleteRowAction->setObjectName(QString::fromUtf8("deleteRowAction"));
+        deleteRowAction->setEnabled(false);
+        vboxLayout = new QVBoxLayout(Browser);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(8);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        splitter_2 = new QSplitter(Browser);
+        splitter_2->setObjectName(QString::fromUtf8("splitter_2"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(splitter_2->sizePolicy().hasHeightForWidth());
+        splitter_2->setSizePolicy(sizePolicy);
+        splitter_2->setOrientation(Qt::Horizontal);
+        connectionWidget = new ConnectionWidget(splitter_2);
+        connectionWidget->setObjectName(QString::fromUtf8("connectionWidget"));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(13), static_cast<QSizePolicy::Policy>(7));
+        sizePolicy1.setHorizontalStretch(1);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(connectionWidget->sizePolicy().hasHeightForWidth());
+        connectionWidget->setSizePolicy(sizePolicy1);
+        splitter_2->addWidget(connectionWidget);
+        table = new QTableView(splitter_2);
+        table->setObjectName(QString::fromUtf8("table"));
+        QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+        sizePolicy2.setHorizontalStretch(2);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(table->sizePolicy().hasHeightForWidth());
+        table->setSizePolicy(sizePolicy2);
+        table->setContextMenuPolicy(Qt::ActionsContextMenu);
+        table->setSelectionBehavior(QAbstractItemView::SelectRows);
+        splitter_2->addWidget(table);
+
+        vboxLayout->addWidget(splitter_2);
+
+        groupBox = new QGroupBox(Browser);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(3));
+        sizePolicy3.setHorizontalStretch(0);
+        sizePolicy3.setVerticalStretch(0);
+        sizePolicy3.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth());
+        groupBox->setSizePolicy(sizePolicy3);
+        groupBox->setMaximumSize(QSize(16777215, 180));
+        vboxLayout1 = new QVBoxLayout(groupBox);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(9);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        sqlEdit = new QTextEdit(groupBox);
+        sqlEdit->setObjectName(QString::fromUtf8("sqlEdit"));
+        QSizePolicy sizePolicy4(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(3));
+        sizePolicy4.setHorizontalStretch(0);
+        sizePolicy4.setVerticalStretch(0);
+        sizePolicy4.setHeightForWidth(sqlEdit->sizePolicy().hasHeightForWidth());
+        sqlEdit->setSizePolicy(sizePolicy4);
+        sqlEdit->setMinimumSize(QSize(0, 18));
+        sqlEdit->setBaseSize(QSize(0, 120));
+
+        vboxLayout1->addWidget(sqlEdit);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(1);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+        clearButton = new QPushButton(groupBox);
+        clearButton->setObjectName(QString::fromUtf8("clearButton"));
+
+        hboxLayout->addWidget(clearButton);
+
+        submitButton = new QPushButton(groupBox);
+        submitButton->setObjectName(QString::fromUtf8("submitButton"));
+
+        hboxLayout->addWidget(submitButton);
+
+
+        vboxLayout1->addLayout(hboxLayout);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        QWidget::setTabOrder(sqlEdit, clearButton);
+        QWidget::setTabOrder(clearButton, submitButton);
+        QWidget::setTabOrder(submitButton, connectionWidget);
+        QWidget::setTabOrder(connectionWidget, table);
+
+        retranslateUi(Browser);
+
+        QMetaObject::connectSlotsByName(Browser);
+    } // setupUi
+
+    void retranslateUi(QWidget *Browser)
+    {
+        Browser->setWindowTitle(QApplication::translate("Browser", "Qt SQL Browser", 0, QApplication::UnicodeUTF8));
+        insertRowAction->setText(QApplication::translate("Browser", "&Insert Row", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_STATUSTIP
+        insertRowAction->setStatusTip(QApplication::translate("Browser", "Inserts a new Row", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+        deleteRowAction->setText(QApplication::translate("Browser", "&Delete Row", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_STATUSTIP
+        deleteRowAction->setStatusTip(QApplication::translate("Browser", "Deletes the current Row", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+        groupBox->setTitle(QApplication::translate("Browser", "SQL Query", 0, QApplication::UnicodeUTF8));
+        clearButton->setText(QApplication::translate("Browser", "&Clear", 0, QApplication::UnicodeUTF8));
+        submitButton->setText(QApplication::translate("Browser", "&Submit", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Browser);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Browser: public Ui_Browser {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // BROWSERWIDGET_H
diff --git a/tests/auto/uic/baseline/calculator.ui b/tests/auto/uic/baseline/calculator.ui
new file mode 100644
index 0000000..bb519ba
--- /dev/null
+++ b/tests/auto/uic/baseline/calculator.ui
@@ -0,0 +1,406 @@
+<ui version="4.0" >
+ <class>Calculator</class>
+ <widget class="QWidget" name="Calculator" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>314</width>
+    <height>301</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>314</width>
+    <height>301</height>
+   </size>
+  </property>
+  <property name="maximumSize" >
+   <size>
+    <width>314</width>
+    <height>301</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>Calculator</string>
+  </property>
+  <widget class="QToolButton" name="backspaceButton" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>50</y>
+     <width>91</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Backspace</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="clearButton" >
+   <property name="geometry" >
+    <rect>
+     <x>110</x>
+     <y>50</y>
+     <width>91</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Clear</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="clearAllButton" >
+   <property name="geometry" >
+    <rect>
+     <x>210</x>
+     <y>50</y>
+     <width>91</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Clear All</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="clearMemoryButton" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>100</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>MC</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="readMemoryButton" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>150</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>MR</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="setMemoryButton" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>200</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>MS</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="addToMemoryButton" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>250</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>M+</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="sevenButton" >
+   <property name="geometry" >
+    <rect>
+     <x>60</x>
+     <y>100</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>7</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="eightButton" >
+   <property name="geometry" >
+    <rect>
+     <x>110</x>
+     <y>100</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>8</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="nineButton" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>100</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>9</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="fourButton" >
+   <property name="geometry" >
+    <rect>
+     <x>60</x>
+     <y>150</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>4</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="fiveButton" >
+   <property name="geometry" >
+    <rect>
+     <x>110</x>
+     <y>150</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>5</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="sixButton" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>150</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>6</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="oneButton" >
+   <property name="geometry" >
+    <rect>
+     <x>60</x>
+     <y>200</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>1</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="twoButton" >
+   <property name="geometry" >
+    <rect>
+     <x>110</x>
+     <y>200</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>2</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="threeButton" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>200</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>3</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="zeroButton" >
+   <property name="geometry" >
+    <rect>
+     <x>60</x>
+     <y>250</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>0</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="pointButton" >
+   <property name="geometry" >
+    <rect>
+     <x>110</x>
+     <y>250</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>.</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="changeSignButton" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>250</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>+-</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="plusButton" >
+   <property name="geometry" >
+    <rect>
+     <x>210</x>
+     <y>250</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>+</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="divisionButton" >
+   <property name="geometry" >
+    <rect>
+     <x>210</x>
+     <y>100</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>/</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="timesButton" >
+   <property name="geometry" >
+    <rect>
+     <x>210</x>
+     <y>150</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>*</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="minusButton" >
+   <property name="geometry" >
+    <rect>
+     <x>210</x>
+     <y>200</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>-</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="squareRootButton" >
+   <property name="geometry" >
+    <rect>
+     <x>260</x>
+     <y>100</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Sqrt</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="powerButton" >
+   <property name="geometry" >
+    <rect>
+     <x>260</x>
+     <y>150</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>x^2</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="reciprocalButton" >
+   <property name="geometry" >
+    <rect>
+     <x>260</x>
+     <y>200</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>1/x</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="equalButton" >
+   <property name="geometry" >
+    <rect>
+     <x>260</x>
+     <y>250</y>
+     <width>41</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>=</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="display" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>291</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="maxLength" >
+    <number>15</number>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+   <property name="readOnly" >
+    <bool>true</bool>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/calculator.ui.h b/tests/auto/uic/baseline/calculator.ui.h
new file mode 100644
index 0000000..aa70aff
--- /dev/null
+++ b/tests/auto/uic/baseline/calculator.ui.h
@@ -0,0 +1,202 @@
+/********************************************************************************
+** Form generated from reading ui file 'calculator.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CALCULATOR_H
+#define CALCULATOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLineEdit>
+#include <QtGui/QToolButton>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Calculator
+{
+public:
+    QToolButton *backspaceButton;
+    QToolButton *clearButton;
+    QToolButton *clearAllButton;
+    QToolButton *clearMemoryButton;
+    QToolButton *readMemoryButton;
+    QToolButton *setMemoryButton;
+    QToolButton *addToMemoryButton;
+    QToolButton *sevenButton;
+    QToolButton *eightButton;
+    QToolButton *nineButton;
+    QToolButton *fourButton;
+    QToolButton *fiveButton;
+    QToolButton *sixButton;
+    QToolButton *oneButton;
+    QToolButton *twoButton;
+    QToolButton *threeButton;
+    QToolButton *zeroButton;
+    QToolButton *pointButton;
+    QToolButton *changeSignButton;
+    QToolButton *plusButton;
+    QToolButton *divisionButton;
+    QToolButton *timesButton;
+    QToolButton *minusButton;
+    QToolButton *squareRootButton;
+    QToolButton *powerButton;
+    QToolButton *reciprocalButton;
+    QToolButton *equalButton;
+    QLineEdit *display;
+
+    void setupUi(QWidget *Calculator)
+    {
+        if (Calculator->objectName().isEmpty())
+            Calculator->setObjectName(QString::fromUtf8("Calculator"));
+        Calculator->resize(314, 301);
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(Calculator->sizePolicy().hasHeightForWidth());
+        Calculator->setSizePolicy(sizePolicy);
+        Calculator->setMinimumSize(QSize(314, 301));
+        Calculator->setMaximumSize(QSize(314, 301));
+        backspaceButton = new QToolButton(Calculator);
+        backspaceButton->setObjectName(QString::fromUtf8("backspaceButton"));
+        backspaceButton->setGeometry(QRect(10, 50, 91, 41));
+        clearButton = new QToolButton(Calculator);
+        clearButton->setObjectName(QString::fromUtf8("clearButton"));
+        clearButton->setGeometry(QRect(110, 50, 91, 41));
+        clearAllButton = new QToolButton(Calculator);
+        clearAllButton->setObjectName(QString::fromUtf8("clearAllButton"));
+        clearAllButton->setGeometry(QRect(210, 50, 91, 41));
+        clearMemoryButton = new QToolButton(Calculator);
+        clearMemoryButton->setObjectName(QString::fromUtf8("clearMemoryButton"));
+        clearMemoryButton->setGeometry(QRect(10, 100, 41, 41));
+        readMemoryButton = new QToolButton(Calculator);
+        readMemoryButton->setObjectName(QString::fromUtf8("readMemoryButton"));
+        readMemoryButton->setGeometry(QRect(10, 150, 41, 41));
+        setMemoryButton = new QToolButton(Calculator);
+        setMemoryButton->setObjectName(QString::fromUtf8("setMemoryButton"));
+        setMemoryButton->setGeometry(QRect(10, 200, 41, 41));
+        addToMemoryButton = new QToolButton(Calculator);
+        addToMemoryButton->setObjectName(QString::fromUtf8("addToMemoryButton"));
+        addToMemoryButton->setGeometry(QRect(10, 250, 41, 41));
+        sevenButton = new QToolButton(Calculator);
+        sevenButton->setObjectName(QString::fromUtf8("sevenButton"));
+        sevenButton->setGeometry(QRect(60, 100, 41, 41));
+        eightButton = new QToolButton(Calculator);
+        eightButton->setObjectName(QString::fromUtf8("eightButton"));
+        eightButton->setGeometry(QRect(110, 100, 41, 41));
+        nineButton = new QToolButton(Calculator);
+        nineButton->setObjectName(QString::fromUtf8("nineButton"));
+        nineButton->setGeometry(QRect(160, 100, 41, 41));
+        fourButton = new QToolButton(Calculator);
+        fourButton->setObjectName(QString::fromUtf8("fourButton"));
+        fourButton->setGeometry(QRect(60, 150, 41, 41));
+        fiveButton = new QToolButton(Calculator);
+        fiveButton->setObjectName(QString::fromUtf8("fiveButton"));
+        fiveButton->setGeometry(QRect(110, 150, 41, 41));
+        sixButton = new QToolButton(Calculator);
+        sixButton->setObjectName(QString::fromUtf8("sixButton"));
+        sixButton->setGeometry(QRect(160, 150, 41, 41));
+        oneButton = new QToolButton(Calculator);
+        oneButton->setObjectName(QString::fromUtf8("oneButton"));
+        oneButton->setGeometry(QRect(60, 200, 41, 41));
+        twoButton = new QToolButton(Calculator);
+        twoButton->setObjectName(QString::fromUtf8("twoButton"));
+        twoButton->setGeometry(QRect(110, 200, 41, 41));
+        threeButton = new QToolButton(Calculator);
+        threeButton->setObjectName(QString::fromUtf8("threeButton"));
+        threeButton->setGeometry(QRect(160, 200, 41, 41));
+        zeroButton = new QToolButton(Calculator);
+        zeroButton->setObjectName(QString::fromUtf8("zeroButton"));
+        zeroButton->setGeometry(QRect(60, 250, 41, 41));
+        pointButton = new QToolButton(Calculator);
+        pointButton->setObjectName(QString::fromUtf8("pointButton"));
+        pointButton->setGeometry(QRect(110, 250, 41, 41));
+        changeSignButton = new QToolButton(Calculator);
+        changeSignButton->setObjectName(QString::fromUtf8("changeSignButton"));
+        changeSignButton->setGeometry(QRect(160, 250, 41, 41));
+        plusButton = new QToolButton(Calculator);
+        plusButton->setObjectName(QString::fromUtf8("plusButton"));
+        plusButton->setGeometry(QRect(210, 250, 41, 41));
+        divisionButton = new QToolButton(Calculator);
+        divisionButton->setObjectName(QString::fromUtf8("divisionButton"));
+        divisionButton->setGeometry(QRect(210, 100, 41, 41));
+        timesButton = new QToolButton(Calculator);
+        timesButton->setObjectName(QString::fromUtf8("timesButton"));
+        timesButton->setGeometry(QRect(210, 150, 41, 41));
+        minusButton = new QToolButton(Calculator);
+        minusButton->setObjectName(QString::fromUtf8("minusButton"));
+        minusButton->setGeometry(QRect(210, 200, 41, 41));
+        squareRootButton = new QToolButton(Calculator);
+        squareRootButton->setObjectName(QString::fromUtf8("squareRootButton"));
+        squareRootButton->setGeometry(QRect(260, 100, 41, 41));
+        powerButton = new QToolButton(Calculator);
+        powerButton->setObjectName(QString::fromUtf8("powerButton"));
+        powerButton->setGeometry(QRect(260, 150, 41, 41));
+        reciprocalButton = new QToolButton(Calculator);
+        reciprocalButton->setObjectName(QString::fromUtf8("reciprocalButton"));
+        reciprocalButton->setGeometry(QRect(260, 200, 41, 41));
+        equalButton = new QToolButton(Calculator);
+        equalButton->setObjectName(QString::fromUtf8("equalButton"));
+        equalButton->setGeometry(QRect(260, 250, 41, 41));
+        display = new QLineEdit(Calculator);
+        display->setObjectName(QString::fromUtf8("display"));
+        display->setGeometry(QRect(10, 10, 291, 31));
+        display->setMaxLength(15);
+        display->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+        display->setReadOnly(true);
+
+        retranslateUi(Calculator);
+
+        QMetaObject::connectSlotsByName(Calculator);
+    } // setupUi
+
+    void retranslateUi(QWidget *Calculator)
+    {
+        Calculator->setWindowTitle(QApplication::translate("Calculator", "Calculator", 0, QApplication::UnicodeUTF8));
+        backspaceButton->setText(QApplication::translate("Calculator", "Backspace", 0, QApplication::UnicodeUTF8));
+        clearButton->setText(QApplication::translate("Calculator", "Clear", 0, QApplication::UnicodeUTF8));
+        clearAllButton->setText(QApplication::translate("Calculator", "Clear All", 0, QApplication::UnicodeUTF8));
+        clearMemoryButton->setText(QApplication::translate("Calculator", "MC", 0, QApplication::UnicodeUTF8));
+        readMemoryButton->setText(QApplication::translate("Calculator", "MR", 0, QApplication::UnicodeUTF8));
+        setMemoryButton->setText(QApplication::translate("Calculator", "MS", 0, QApplication::UnicodeUTF8));
+        addToMemoryButton->setText(QApplication::translate("Calculator", "M+", 0, QApplication::UnicodeUTF8));
+        sevenButton->setText(QApplication::translate("Calculator", "7", 0, QApplication::UnicodeUTF8));
+        eightButton->setText(QApplication::translate("Calculator", "8", 0, QApplication::UnicodeUTF8));
+        nineButton->setText(QApplication::translate("Calculator", "9", 0, QApplication::UnicodeUTF8));
+        fourButton->setText(QApplication::translate("Calculator", "4", 0, QApplication::UnicodeUTF8));
+        fiveButton->setText(QApplication::translate("Calculator", "5", 0, QApplication::UnicodeUTF8));
+        sixButton->setText(QApplication::translate("Calculator", "6", 0, QApplication::UnicodeUTF8));
+        oneButton->setText(QApplication::translate("Calculator", "1", 0, QApplication::UnicodeUTF8));
+        twoButton->setText(QApplication::translate("Calculator", "2", 0, QApplication::UnicodeUTF8));
+        threeButton->setText(QApplication::translate("Calculator", "3", 0, QApplication::UnicodeUTF8));
+        zeroButton->setText(QApplication::translate("Calculator", "0", 0, QApplication::UnicodeUTF8));
+        pointButton->setText(QApplication::translate("Calculator", ".", 0, QApplication::UnicodeUTF8));
+        changeSignButton->setText(QApplication::translate("Calculator", "+-", 0, QApplication::UnicodeUTF8));
+        plusButton->setText(QApplication::translate("Calculator", "+", 0, QApplication::UnicodeUTF8));
+        divisionButton->setText(QApplication::translate("Calculator", "/", 0, QApplication::UnicodeUTF8));
+        timesButton->setText(QApplication::translate("Calculator", "*", 0, QApplication::UnicodeUTF8));
+        minusButton->setText(QApplication::translate("Calculator", "-", 0, QApplication::UnicodeUTF8));
+        squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", 0, QApplication::UnicodeUTF8));
+        powerButton->setText(QApplication::translate("Calculator", "x^2", 0, QApplication::UnicodeUTF8));
+        reciprocalButton->setText(QApplication::translate("Calculator", "1/x", 0, QApplication::UnicodeUTF8));
+        equalButton->setText(QApplication::translate("Calculator", "=", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Calculator);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Calculator: public Ui_Calculator {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CALCULATOR_H
diff --git a/tests/auto/uic/baseline/calculatorform.ui b/tests/auto/uic/baseline/calculatorform.ui
new file mode 100644
index 0000000..dda0e62
--- /dev/null
+++ b/tests/auto/uic/baseline/calculatorform.ui
@@ -0,0 +1,303 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>CalculatorForm</class>
+ <widget class="QWidget" name="CalculatorForm" >
+  <property name="objectName" >
+   <string notr="true" >CalculatorForm</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>276</width>
+    <height>98</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Calculator Builder</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="objectName" >
+          <string notr="true" >label</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>45</width>
+           <height>19</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Input 1</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="inputSpinBox1" >
+         <property name="objectName" >
+          <string notr="true" >inputSpinBox1</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>26</y>
+           <width>45</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="mouseTracking" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3" >
+       <property name="objectName" >
+        <string notr="true" >label_3</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>54</x>
+         <y>1</y>
+         <width>7</width>
+         <height>52</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>+</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2" >
+         <property name="objectName" >
+          <string notr="true" >label_2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>45</width>
+           <height>19</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Input 2</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="inputSpinBox2" >
+         <property name="objectName" >
+          <string notr="true" >inputSpinBox2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>26</y>
+           <width>45</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="mouseTracking" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3_2" >
+       <property name="objectName" >
+        <string notr="true" >label_3_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>120</x>
+         <y>1</y>
+         <width>7</width>
+         <height>52</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>=</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2_2_2" >
+         <property name="objectName" >
+          <string notr="true" >label_2_2_2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>37</width>
+           <height>17</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Output</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="outputWidget" >
+         <property name="objectName" >
+          <string notr="true" >outputWidget</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>24</y>
+           <width>37</width>
+           <height>27</height>
+          </rect>
+         </property>
+         <property name="frameShape" >
+          <enum>QFrame::Box</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</enum>
+         </property>
+         <property name="text" >
+          <string>0</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignAbsolute|Qt::AlignBottom|Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignHorizontal_Mask|Qt::AlignJustify|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing|Qt::AlignVCenter|Qt::AlignVertical_Mask</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >verticalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>85</x>
+       <y>69</y>
+       <width>20</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >horizontalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>188</x>
+       <y>26</y>
+       <width>79</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/calculatorform.ui.h b/tests/auto/uic/baseline/calculatorform.ui.h
new file mode 100644
index 0000000..5fab91f
--- /dev/null
+++ b/tests/auto/uic/baseline/calculatorform.ui.h
@@ -0,0 +1,195 @@
+/********************************************************************************
+** Form generated from reading ui file 'calculatorform.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CALCULATORFORM_H
+#define CALCULATORFORM_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_CalculatorForm
+{
+public:
+    QGridLayout *gridLayout;
+    QHBoxLayout *hboxLayout;
+    QVBoxLayout *vboxLayout;
+    QLabel *label;
+    QSpinBox *inputSpinBox1;
+    QLabel *label_3;
+    QVBoxLayout *vboxLayout1;
+    QLabel *label_2;
+    QSpinBox *inputSpinBox2;
+    QLabel *label_3_2;
+    QVBoxLayout *vboxLayout2;
+    QLabel *label_2_2_2;
+    QLabel *outputWidget;
+    QSpacerItem *spacerItem;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QWidget *CalculatorForm)
+    {
+        if (CalculatorForm->objectName().isEmpty())
+            CalculatorForm->setObjectName(QString::fromUtf8("CalculatorForm"));
+        CalculatorForm->resize(276, 98);
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(5));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(CalculatorForm->sizePolicy().hasHeightForWidth());
+        CalculatorForm->setSizePolicy(sizePolicy);
+        gridLayout = new QGridLayout(CalculatorForm);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8(""));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(1);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8(""));
+        vboxLayout = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(1);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8(""));
+        label = new QLabel(CalculatorForm);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setGeometry(QRect(1, 1, 45, 19));
+
+        vboxLayout->addWidget(label);
+
+        inputSpinBox1 = new QSpinBox(CalculatorForm);
+        inputSpinBox1->setObjectName(QString::fromUtf8("inputSpinBox1"));
+        inputSpinBox1->setGeometry(QRect(1, 26, 45, 25));
+        inputSpinBox1->setMouseTracking(true);
+
+        vboxLayout->addWidget(inputSpinBox1);
+
+
+        hboxLayout->addLayout(vboxLayout);
+
+        label_3 = new QLabel(CalculatorForm);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+        label_3->setGeometry(QRect(54, 1, 7, 52));
+        label_3->setAlignment(Qt::AlignCenter);
+
+        hboxLayout->addWidget(label_3);
+
+        vboxLayout1 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+        vboxLayout1->setMargin(1);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setObjectName(QString::fromUtf8(""));
+        label_2 = new QLabel(CalculatorForm);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        label_2->setGeometry(QRect(1, 1, 45, 19));
+
+        vboxLayout1->addWidget(label_2);
+
+        inputSpinBox2 = new QSpinBox(CalculatorForm);
+        inputSpinBox2->setObjectName(QString::fromUtf8("inputSpinBox2"));
+        inputSpinBox2->setGeometry(QRect(1, 26, 45, 25));
+        inputSpinBox2->setMouseTracking(true);
+
+        vboxLayout1->addWidget(inputSpinBox2);
+
+
+        hboxLayout->addLayout(vboxLayout1);
+
+        label_3_2 = new QLabel(CalculatorForm);
+        label_3_2->setObjectName(QString::fromUtf8("label_3_2"));
+        label_3_2->setGeometry(QRect(120, 1, 7, 52));
+        label_3_2->setAlignment(Qt::AlignCenter);
+
+        hboxLayout->addWidget(label_3_2);
+
+        vboxLayout2 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+        vboxLayout2->setMargin(1);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setObjectName(QString::fromUtf8(""));
+        label_2_2_2 = new QLabel(CalculatorForm);
+        label_2_2_2->setObjectName(QString::fromUtf8("label_2_2_2"));
+        label_2_2_2->setGeometry(QRect(1, 1, 37, 17));
+
+        vboxLayout2->addWidget(label_2_2_2);
+
+        outputWidget = new QLabel(CalculatorForm);
+        outputWidget->setObjectName(QString::fromUtf8("outputWidget"));
+        outputWidget->setGeometry(QRect(1, 24, 37, 27));
+        outputWidget->setFrameShape(QFrame::Box);
+        outputWidget->setFrameShadow(QFrame::Sunken);
+        outputWidget->setAlignment(Qt::AlignAbsolute|Qt::AlignBottom|Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignHorizontal_Mask|Qt::AlignJustify|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing|Qt::AlignVCenter|Qt::AlignVertical_Mask);
+
+        vboxLayout2->addWidget(outputWidget);
+
+
+        hboxLayout->addLayout(vboxLayout2);
+
+
+        gridLayout->addLayout(hboxLayout, 0, 0, 1, 1);
+
+        spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem, 1, 0, 1, 1);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem1, 0, 1, 1, 1);
+
+
+        retranslateUi(CalculatorForm);
+
+        QMetaObject::connectSlotsByName(CalculatorForm);
+    } // setupUi
+
+    void retranslateUi(QWidget *CalculatorForm)
+    {
+        CalculatorForm->setWindowTitle(QApplication::translate("CalculatorForm", "Calculator Builder", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("CalculatorForm", "Input 1", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("CalculatorForm", "+", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("CalculatorForm", "Input 2", 0, QApplication::UnicodeUTF8));
+        label_3_2->setText(QApplication::translate("CalculatorForm", "=", 0, QApplication::UnicodeUTF8));
+        label_2_2_2->setText(QApplication::translate("CalculatorForm", "Output", 0, QApplication::UnicodeUTF8));
+        outputWidget->setText(QApplication::translate("CalculatorForm", "0", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(CalculatorForm);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class CalculatorForm: public Ui_CalculatorForm {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CALCULATORFORM_H
diff --git a/tests/auto/uic/baseline/certificateinfo.ui b/tests/auto/uic/baseline/certificateinfo.ui
new file mode 100644
index 0000000..3761fe8
--- /dev/null
+++ b/tests/auto/uic/baseline/certificateinfo.ui
@@ -0,0 +1,85 @@
+<ui version="4.0" >
+ <class>CertificateInfo</class>
+ <widget class="QDialog" name="CertificateInfo" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>397</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Display Certificate Information</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Certification Path</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QListWidget" name="certificationPathView" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Certificate Information</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QListWidget" name="certificateInfoView" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>clicked(QAbstractButton*)</signal>
+   <receiver>CertificateInfo</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>343</x>
+     <y>374</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>352</x>
+     <y>422</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/certificateinfo.ui.h b/tests/auto/uic/baseline/certificateinfo.ui.h
new file mode 100644
index 0000000..bbb5d5f
--- /dev/null
+++ b/tests/auto/uic/baseline/certificateinfo.ui.h
@@ -0,0 +1,111 @@
+/********************************************************************************
+** Form generated from reading ui file 'certificateinfo.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CERTIFICATEINFO_H
+#define CERTIFICATEINFO_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_CertificateInfo
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QHBoxLayout *hboxLayout;
+    QListWidget *certificationPathView;
+    QGroupBox *groupBox_2;
+    QHBoxLayout *hboxLayout1;
+    QListWidget *certificateInfoView;
+    QHBoxLayout *hboxLayout2;
+    QSpacerItem *spacerItem;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *CertificateInfo)
+    {
+        if (CertificateInfo->objectName().isEmpty())
+            CertificateInfo->setObjectName(QString::fromUtf8("CertificateInfo"));
+        CertificateInfo->resize(400, 397);
+        vboxLayout = new QVBoxLayout(CertificateInfo);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(CertificateInfo);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        hboxLayout = new QHBoxLayout(groupBox);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        certificationPathView = new QListWidget(groupBox);
+        certificationPathView->setObjectName(QString::fromUtf8("certificationPathView"));
+
+        hboxLayout->addWidget(certificationPathView);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        groupBox_2 = new QGroupBox(CertificateInfo);
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        hboxLayout1 = new QHBoxLayout(groupBox_2);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        certificateInfoView = new QListWidget(groupBox_2);
+        certificateInfoView->setObjectName(QString::fromUtf8("certificateInfoView"));
+
+        hboxLayout1->addWidget(certificateInfoView);
+
+
+        vboxLayout->addWidget(groupBox_2);
+
+        hboxLayout2 = new QHBoxLayout();
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout2->addItem(spacerItem);
+
+        buttonBox = new QDialogButtonBox(CertificateInfo);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setStandardButtons(QDialogButtonBox::Close);
+
+        hboxLayout2->addWidget(buttonBox);
+
+
+        vboxLayout->addLayout(hboxLayout2);
+
+
+        retranslateUi(CertificateInfo);
+        QObject::connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), CertificateInfo, SLOT(accept()));
+
+        QMetaObject::connectSlotsByName(CertificateInfo);
+    } // setupUi
+
+    void retranslateUi(QDialog *CertificateInfo)
+    {
+        CertificateInfo->setWindowTitle(QApplication::translate("CertificateInfo", "Display Certificate Information", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("CertificateInfo", "Certification Path", 0, QApplication::UnicodeUTF8));
+        groupBox_2->setTitle(QApplication::translate("CertificateInfo", "Certificate Information", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(CertificateInfo);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class CertificateInfo: public Ui_CertificateInfo {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CERTIFICATEINFO_H
diff --git a/tests/auto/uic/baseline/chatdialog.ui b/tests/auto/uic/baseline/chatdialog.ui
new file mode 100644
index 0000000..c85e0d0
--- /dev/null
+++ b/tests/auto/uic/baseline/chatdialog.ui
@@ -0,0 +1,79 @@
+<ui version="4.0" >
+ <class>ChatDialog</class>
+ <widget class="QDialog" name="ChatDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>513</width>
+    <height>349</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Chat</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QTextEdit" name="textEdit" >
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="readOnly" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QListWidget" name="listWidget" >
+       <property name="maximumSize" >
+        <size>
+         <width>180</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Message:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEdit" />
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/chatdialog.ui.h b/tests/auto/uic/baseline/chatdialog.ui.h
new file mode 100644
index 0000000..062a6be
--- /dev/null
+++ b/tests/auto/uic/baseline/chatdialog.ui.h
@@ -0,0 +1,117 @@
+/********************************************************************************
+** Form generated from reading ui file 'chatdialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CHATDIALOG_H
+#define CHATDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListWidget>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_ChatDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QTextEdit *textEdit;
+    QListWidget *listWidget;
+    QHBoxLayout *hboxLayout1;
+    QLabel *label;
+    QLineEdit *lineEdit;
+
+    void setupUi(QDialog *ChatDialog)
+    {
+        if (ChatDialog->objectName().isEmpty())
+            ChatDialog->setObjectName(QString::fromUtf8("ChatDialog"));
+        ChatDialog->resize(513, 349);
+        vboxLayout = new QVBoxLayout(ChatDialog);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(0);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        textEdit = new QTextEdit(ChatDialog);
+        textEdit->setObjectName(QString::fromUtf8("textEdit"));
+        textEdit->setFocusPolicy(Qt::NoFocus);
+        textEdit->setReadOnly(true);
+
+        hboxLayout->addWidget(textEdit);
+
+        listWidget = new QListWidget(ChatDialog);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+        listWidget->setMaximumSize(QSize(180, 16777215));
+        listWidget->setFocusPolicy(Qt::NoFocus);
+
+        hboxLayout->addWidget(listWidget);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        label = new QLabel(ChatDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        hboxLayout1->addWidget(label);
+
+        lineEdit = new QLineEdit(ChatDialog);
+        lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
+
+        hboxLayout1->addWidget(lineEdit);
+
+
+        vboxLayout->addLayout(hboxLayout1);
+
+
+        retranslateUi(ChatDialog);
+
+        QMetaObject::connectSlotsByName(ChatDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *ChatDialog)
+    {
+        ChatDialog->setWindowTitle(QApplication::translate("ChatDialog", "Chat", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("ChatDialog", "Message:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(ChatDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class ChatDialog: public Ui_ChatDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CHATDIALOG_H
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui b/tests/auto/uic/baseline/chatmainwindow.ui
new file mode 100644
index 0000000..0616dcb
--- /dev/null
+++ b/tests/auto/uic/baseline/chatmainwindow.ui
@@ -0,0 +1,185 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>ChatMainWindow</class>
+ <widget class="QMainWindow" name="ChatMainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>QtDBus Chat</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QHBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QTextBrowser" name="chatHistory" >
+        <property name="acceptDrops" >
+         <bool>false</bool>
+        </property>
+        <property name="toolTip" >
+         <string>Messages sent and received from other users</string>
+        </property>
+        <property name="acceptRichText" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>Message:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>messageLineEdit</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="messageLineEdit" />
+        </item>
+        <item>
+         <widget class="QPushButton" name="sendButton" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>1</hsizetype>
+            <vsizetype>0</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip" >
+           <string>Sends a message to other people</string>
+          </property>
+          <property name="whatsThis" >
+           <string/>
+          </property>
+          <property name="text" >
+           <string>Send</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuQuit" >
+    <property name="title" >
+     <string>Help</string>
+    </property>
+    <addaction name="actionAboutQt" />
+   </widget>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <addaction name="actionChangeNickname" />
+    <addaction name="separator" />
+    <addaction name="actionQuit" />
+   </widget>
+   <addaction name="menuFile" />
+   <addaction name="menuQuit" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <action name="actionQuit" >
+   <property name="text" >
+    <string>Quit</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="actionAboutQt" >
+   <property name="text" >
+    <string>About Qt...</string>
+   </property>
+  </action>
+  <action name="actionChangeNickname" >
+   <property name="text" >
+    <string>Change nickname...</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>chatHistory</tabstop>
+  <tabstop>messageLineEdit</tabstop>
+  <tabstop>sendButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>messageLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>sendButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>299</x>
+     <y>554</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>744</x>
+     <y>551</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionQuit</sender>
+   <signal>triggered(bool)</signal>
+   <receiver>ChatMainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>399</x>
+     <y>299</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui.h b/tests/auto/uic/baseline/chatmainwindow.ui.h
new file mode 100644
index 0000000..b2153e6
--- /dev/null
+++ b/tests/auto/uic/baseline/chatmainwindow.ui.h
@@ -0,0 +1,182 @@
+/********************************************************************************
+** Form generated from reading ui file 'chatmainwindow.ui'
+**
+** Created: Mon Sep 1 09:31:02 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CHATMAINWINDOW_H
+#define CHATMAINWINDOW_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QStatusBar>
+#include <QtGui/QTextBrowser>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_ChatMainWindow
+{
+public:
+    QAction *actionQuit;
+    QAction *actionAboutQt;
+    QAction *actionChangeNickname;
+    QWidget *centralwidget;
+    QHBoxLayout *hboxLayout;
+    QVBoxLayout *vboxLayout;
+    QTextBrowser *chatHistory;
+    QHBoxLayout *hboxLayout1;
+    QLabel *label;
+    QLineEdit *messageLineEdit;
+    QPushButton *sendButton;
+    QMenuBar *menubar;
+    QMenu *menuQuit;
+    QMenu *menuFile;
+    QStatusBar *statusbar;
+
+    void setupUi(QMainWindow *ChatMainWindow)
+    {
+        if (ChatMainWindow->objectName().isEmpty())
+            ChatMainWindow->setObjectName(QString::fromUtf8("ChatMainWindow"));
+        ChatMainWindow->resize(800, 600);
+        actionQuit = new QAction(ChatMainWindow);
+        actionQuit->setObjectName(QString::fromUtf8("actionQuit"));
+        actionAboutQt = new QAction(ChatMainWindow);
+        actionAboutQt->setObjectName(QString::fromUtf8("actionAboutQt"));
+        actionChangeNickname = new QAction(ChatMainWindow);
+        actionChangeNickname->setObjectName(QString::fromUtf8("actionChangeNickname"));
+        centralwidget = new QWidget(ChatMainWindow);
+        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
+        hboxLayout = new QHBoxLayout(centralwidget);
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(9);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        vboxLayout = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(0);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        chatHistory = new QTextBrowser(centralwidget);
+        chatHistory->setObjectName(QString::fromUtf8("chatHistory"));
+        chatHistory->setAcceptDrops(false);
+        chatHistory->setAcceptRichText(true);
+
+        vboxLayout->addWidget(chatHistory);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        label = new QLabel(centralwidget);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        hboxLayout1->addWidget(label);
+
+        messageLineEdit = new QLineEdit(centralwidget);
+        messageLineEdit->setObjectName(QString::fromUtf8("messageLineEdit"));
+
+        hboxLayout1->addWidget(messageLineEdit);
+
+        sendButton = new QPushButton(centralwidget);
+        sendButton->setObjectName(QString::fromUtf8("sendButton"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(sendButton->sizePolicy().hasHeightForWidth());
+        sendButton->setSizePolicy(sizePolicy);
+
+        hboxLayout1->addWidget(sendButton);
+
+
+        vboxLayout->addLayout(hboxLayout1);
+
+
+        hboxLayout->addLayout(vboxLayout);
+
+        ChatMainWindow->setCentralWidget(centralwidget);
+        menubar = new QMenuBar(ChatMainWindow);
+        menubar->setObjectName(QString::fromUtf8("menubar"));
+        menubar->setGeometry(QRect(0, 0, 800, 31));
+        menuQuit = new QMenu(menubar);
+        menuQuit->setObjectName(QString::fromUtf8("menuQuit"));
+        menuFile = new QMenu(menubar);
+        menuFile->setObjectName(QString::fromUtf8("menuFile"));
+        ChatMainWindow->setMenuBar(menubar);
+        statusbar = new QStatusBar(ChatMainWindow);
+        statusbar->setObjectName(QString::fromUtf8("statusbar"));
+        ChatMainWindow->setStatusBar(statusbar);
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(messageLineEdit);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(chatHistory, messageLineEdit);
+        QWidget::setTabOrder(messageLineEdit, sendButton);
+
+        menubar->addAction(menuFile->menuAction());
+        menubar->addAction(menuQuit->menuAction());
+        menuQuit->addAction(actionAboutQt);
+        menuFile->addAction(actionChangeNickname);
+        menuFile->addSeparator();
+        menuFile->addAction(actionQuit);
+
+        retranslateUi(ChatMainWindow);
+        QObject::connect(messageLineEdit, SIGNAL(returnPressed()), sendButton, SLOT(animateClick()));
+        QObject::connect(actionQuit, SIGNAL(triggered(bool)), ChatMainWindow, SLOT(close()));
+
+        QMetaObject::connectSlotsByName(ChatMainWindow);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *ChatMainWindow)
+    {
+        ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "QtDBus Chat", 0, QApplication::UnicodeUTF8));
+        actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", 0, QApplication::UnicodeUTF8));
+        actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", 0, QApplication::UnicodeUTF8));
+        actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", 0, QApplication::UnicodeUTF8));
+        actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", 0, QApplication::UnicodeUTF8));
+        actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        label->setText(QApplication::translate("ChatMainWindow", "Message:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        sendButton->setToolTip(QApplication::translate("ChatMainWindow", "Sends a message to other people", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        sendButton->setWhatsThis(QString());
+#endif // QT_NO_WHATSTHIS
+        sendButton->setText(QApplication::translate("ChatMainWindow", "Send", 0, QApplication::UnicodeUTF8));
+        menuQuit->setTitle(QApplication::translate("ChatMainWindow", "Help", 0, QApplication::UnicodeUTF8));
+        menuFile->setTitle(QApplication::translate("ChatMainWindow", "File", 0, QApplication::UnicodeUTF8));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class ChatMainWindow: public Ui_ChatMainWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CHATMAINWINDOW_H
diff --git a/tests/auto/uic/baseline/chatsetnickname.ui b/tests/auto/uic/baseline/chatsetnickname.ui
new file mode 100644
index 0000000..fb9894e
--- /dev/null
+++ b/tests/auto/uic/baseline/chatsetnickname.ui
@@ -0,0 +1,149 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>NicknameDialog</class>
+ <widget class="QDialog" name="NicknameDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>396</width>
+    <height>105</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>1</hsizetype>
+    <vsizetype>1</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Set nickname</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>1</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>New nickname:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="nickname" />
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>131</width>
+         <height>31</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>
+   <receiver>NicknameDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>278</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>96</x>
+     <y>254</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>NicknameDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>369</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>179</x>
+     <y>282</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/chatsetnickname.ui.h b/tests/auto/uic/baseline/chatsetnickname.ui.h
new file mode 100644
index 0000000..de52fed
--- /dev/null
+++ b/tests/auto/uic/baseline/chatsetnickname.ui.h
@@ -0,0 +1,134 @@
+/********************************************************************************
+** Form generated from reading ui file 'chatsetnickname.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CHATSETNICKNAME_H
+#define CHATSETNICKNAME_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_NicknameDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QVBoxLayout *vboxLayout1;
+    QLabel *label;
+    QLineEdit *nickname;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacerItem;
+    QPushButton *okButton;
+    QPushButton *cancelButton;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QDialog *NicknameDialog)
+    {
+        if (NicknameDialog->objectName().isEmpty())
+            NicknameDialog->setObjectName(QString::fromUtf8("NicknameDialog"));
+        NicknameDialog->resize(396, 105);
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(1));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(NicknameDialog->sizePolicy().hasHeightForWidth());
+        NicknameDialog->setSizePolicy(sizePolicy);
+        vboxLayout = new QVBoxLayout(NicknameDialog);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout1 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(0);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        label = new QLabel(NicknameDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+        sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy);
+
+        vboxLayout1->addWidget(label);
+
+        nickname = new QLineEdit(NicknameDialog);
+        nickname->setObjectName(QString::fromUtf8("nickname"));
+
+        vboxLayout1->addWidget(nickname);
+
+
+        vboxLayout->addLayout(vboxLayout1);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+        okButton = new QPushButton(NicknameDialog);
+        okButton->setObjectName(QString::fromUtf8("okButton"));
+
+        hboxLayout->addWidget(okButton);
+
+        cancelButton = new QPushButton(NicknameDialog);
+        cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
+
+        hboxLayout->addWidget(cancelButton);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem1);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+
+        retranslateUi(NicknameDialog);
+        QObject::connect(okButton, SIGNAL(clicked()), NicknameDialog, SLOT(accept()));
+        QObject::connect(cancelButton, SIGNAL(clicked()), NicknameDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(NicknameDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *NicknameDialog)
+    {
+        NicknameDialog->setWindowTitle(QApplication::translate("NicknameDialog", "Set nickname", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("NicknameDialog", "New nickname:", 0, QApplication::UnicodeUTF8));
+        okButton->setText(QApplication::translate("NicknameDialog", "OK", 0, QApplication::UnicodeUTF8));
+        cancelButton->setText(QApplication::translate("NicknameDialog", "Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(NicknameDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class NicknameDialog: public Ui_NicknameDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CHATSETNICKNAME_H
diff --git a/tests/auto/uic/baseline/config.ui b/tests/auto/uic/baseline/config.ui
new file mode 100644
index 0000000..47ad5f5
--- /dev/null
+++ b/tests/auto/uic/baseline/config.ui
@@ -0,0 +1,2527 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>Config</class>
+ <widget class="QDialog" name="Config" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>650</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Configure</string>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <property name="leftMargin" >
+    <number>8</number>
+   </property>
+   <property name="topMargin" >
+    <number>8</number>
+   </property>
+   <property name="rightMargin" >
+    <number>8</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>8</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QGroupBox" name="ButtonGroup1" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title" >
+        <string>Size</string>
+       </property>
+       <layout class="QVBoxLayout" >
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <property name="leftMargin" >
+         <number>11</number>
+        </property>
+        <property name="topMargin" >
+         <number>11</number>
+        </property>
+        <property name="rightMargin" >
+         <number>11</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>11</number>
+        </property>
+        <item>
+         <widget class="QRadioButton" name="size_176_220" >
+          <property name="text" >
+           <string>176x220 "SmartPhone"</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="size_240_320" >
+          <property name="text" >
+           <string>240x320 "PDA"</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="size_320_240" >
+          <property name="text" >
+           <string>320x240 "TV" / "QVGA"</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="size_640_480" >
+          <property name="text" >
+           <string>640x480 "VGA"</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="size_800_600" >
+          <property name="text" >
+           <string>800x600</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="size_1024_768" >
+          <property name="text" >
+           <string>1024x768</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" >
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <property name="leftMargin" >
+           <number>0</number>
+          </property>
+          <property name="topMargin" >
+           <number>0</number>
+          </property>
+          <property name="rightMargin" >
+           <number>0</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QRadioButton" name="size_custom" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string>Custom</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="size_width" >
+            <property name="minimum" >
+             <number>1</number>
+            </property>
+            <property name="maximum" >
+             <number>1280</number>
+            </property>
+            <property name="singleStep" >
+             <number>16</number>
+            </property>
+            <property name="value" >
+             <number>400</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="size_height" >
+            <property name="minimum" >
+             <number>1</number>
+            </property>
+            <property name="maximum" >
+             <number>1024</number>
+            </property>
+            <property name="singleStep" >
+             <number>16</number>
+            </property>
+            <property name="value" >
+             <number>300</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="ButtonGroup2" >
+       <property name="title" >
+        <string>Depth</string>
+       </property>
+       <layout class="QVBoxLayout" >
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <property name="leftMargin" >
+         <number>11</number>
+        </property>
+        <property name="topMargin" >
+         <number>11</number>
+        </property>
+        <property name="rightMargin" >
+         <number>11</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>11</number>
+        </property>
+        <item>
+         <widget class="QRadioButton" name="depth_1" >
+          <property name="text" >
+           <string>1 bit monochrome</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_4gray" >
+          <property name="text" >
+           <string>4 bit grayscale</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_8" >
+          <property name="text" >
+           <string>8 bit</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_12" >
+          <property name="text" >
+           <string>12 (16) bit</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_15" >
+          <property name="text" >
+           <string>15 bit</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_16" >
+          <property name="text" >
+           <string>16 bit</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_18" >
+          <property name="text" >
+           <string>18 bit</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_24" >
+          <property name="text" >
+           <string>24 bit</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_32" >
+          <property name="text" >
+           <string>32 bit</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_32_argb" >
+          <property name="text" >
+           <string>32 bit ARGB</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="TextLabel1_3" >
+       <property name="text" >
+        <string>Skin</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="skin" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text" >
+         <string>None</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="touchScreen" >
+     <property name="text" >
+      <string>Emulate touch screen (no mouse move)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="lcdScreen" >
+     <property name="text" >
+      <string>Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="TextLabel1" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>&lt;p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i>above&lt;/i>. You may freely modify the Gamma &lt;i>below&lt;/i>.</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string>Gamma</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>11</number>
+      </property>
+      <property name="topMargin" >
+       <number>11</number>
+      </property>
+      <property name="rightMargin" >
+       <number>11</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>11</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="text" >
+         <string>Blue</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" >
+       <widget class="QSlider" name="bslider" >
+        <property name="palette" >
+         <palette>
+          <active>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>127</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>38</red>
+              <green>38</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>170</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </active>
+          <inactive>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>127</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>38</red>
+              <green>38</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>170</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </inactive>
+          <disabled>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>127</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>38</red>
+              <green>38</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>170</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </disabled>
+         </palette>
+        </property>
+        <property name="maximum" >
+         <number>400</number>
+        </property>
+        <property name="value" >
+         <number>100</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="2" >
+       <widget class="QLabel" name="blabel" >
+        <property name="text" >
+         <string>1.0</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="text" >
+         <string>Green</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QSlider" name="gslider" >
+        <property name="palette" >
+         <palette>
+          <active>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>255</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>255</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>38</red>
+              <green>255</green>
+              <blue>38</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>127</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>170</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </active>
+          <inactive>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>255</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>255</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>38</red>
+              <green>255</green>
+              <blue>38</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>127</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>170</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </inactive>
+          <disabled>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>255</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>255</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>38</red>
+              <green>255</green>
+              <blue>38</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>127</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>170</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </disabled>
+         </palette>
+        </property>
+        <property name="maximum" >
+         <number>400</number>
+        </property>
+        <property name="value" >
+         <number>100</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLabel" name="glabel" >
+        <property name="text" >
+         <string>1.0</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel7" >
+        <property name="text" >
+         <string>All</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLabel" name="TextLabel8" >
+        <property name="text" >
+         <string>1.0</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QSlider" name="gammaslider" >
+        <property name="palette" >
+         <palette>
+          <active>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>127</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>170</red>
+              <green>170</green>
+              <blue>170</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </active>
+          <inactive>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>127</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>170</red>
+              <green>170</green>
+              <blue>170</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </inactive>
+          <disabled>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>127</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>170</red>
+              <green>170</green>
+              <blue>170</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </disabled>
+         </palette>
+        </property>
+        <property name="maximum" >
+         <number>400</number>
+        </property>
+        <property name="value" >
+         <number>100</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel1_2" >
+        <property name="text" >
+         <string>Red</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLabel" name="rlabel" >
+        <property name="text" >
+         <string>1.0</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QSlider" name="rslider" >
+        <property name="palette" >
+         <palette>
+          <active>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>127</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>38</green>
+              <blue>38</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>170</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </active>
+          <inactive>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>127</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>38</green>
+              <blue>38</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>170</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </inactive>
+          <disabled>
+           <colorrole role="WindowText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Button" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Light" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>127</green>
+              <blue>127</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Midlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>38</green>
+              <blue>38</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Dark" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>127</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Mid" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>170</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Text" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="BrightText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="ButtonText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Base" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Window" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>220</red>
+              <green>220</green>
+              <blue>220</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Shadow" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Highlight" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>10</red>
+              <green>95</green>
+              <blue>137</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="HighlightedText" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="Link" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="LinkVisited" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+           <colorrole role="AlternateBase" >
+            <brush brushstyle="SolidPattern" >
+             <color alpha="255" >
+              <red>232</red>
+              <green>232</green>
+              <blue>232</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </disabled>
+         </palette>
+        </property>
+        <property name="maximum" >
+         <number>400</number>
+        </property>
+        <property name="value" >
+         <number>100</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0" colspan="3" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="text" >
+         <string>Set all to 1.0</string>
+        </property>
+       </widget>
+      </item>
+      <item rowspan="9" row="0" column="3" >
+       <widget class="GammaView" native="1" name="MyCustomWidget1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonOk" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonCancel" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <customwidgets>
+  <customwidget>
+   <class>GammaView</class>
+   <extends></extends>
+   <header>gammaview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>size_width</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>size_custom</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>152</x>
+     <y>193</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>94</x>
+     <y>199</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>size_height</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>size_custom</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>259</x>
+     <y>196</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>64</x>
+     <y>188</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/uic/baseline/config.ui.h
new file mode 100644
index 0000000..2b6eaf8
--- /dev/null
+++ b/tests/auto/uic/baseline/config.ui.h
@@ -0,0 +1,773 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'config.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSlider>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QVBoxLayout>
+#include "gammaview.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Config
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QGroupBox *ButtonGroup1;
+    QVBoxLayout *vboxLayout1;
+    QRadioButton *size_176_220;
+    QRadioButton *size_240_320;
+    QRadioButton *size_320_240;
+    QRadioButton *size_640_480;
+    QRadioButton *size_800_600;
+    QRadioButton *size_1024_768;
+    QHBoxLayout *hboxLayout1;
+    QRadioButton *size_custom;
+    QSpinBox *size_width;
+    QSpinBox *size_height;
+    QGroupBox *ButtonGroup2;
+    QVBoxLayout *vboxLayout2;
+    QRadioButton *depth_1;
+    QRadioButton *depth_4gray;
+    QRadioButton *depth_8;
+    QRadioButton *depth_12;
+    QRadioButton *depth_15;
+    QRadioButton *depth_16;
+    QRadioButton *depth_18;
+    QRadioButton *depth_24;
+    QRadioButton *depth_32;
+    QRadioButton *depth_32_argb;
+    QHBoxLayout *hboxLayout2;
+    QLabel *TextLabel1_3;
+    QComboBox *skin;
+    QCheckBox *touchScreen;
+    QCheckBox *lcdScreen;
+    QSpacerItem *spacerItem;
+    QLabel *TextLabel1;
+    QGroupBox *GroupBox1;
+    QGridLayout *gridLayout;
+    QLabel *TextLabel3;
+    QSlider *bslider;
+    QLabel *blabel;
+    QLabel *TextLabel2;
+    QSlider *gslider;
+    QLabel *glabel;
+    QLabel *TextLabel7;
+    QLabel *TextLabel8;
+    QSlider *gammaslider;
+    QLabel *TextLabel1_2;
+    QLabel *rlabel;
+    QSlider *rslider;
+    QPushButton *PushButton3;
+    GammaView *MyCustomWidget1;
+    QHBoxLayout *hboxLayout3;
+    QSpacerItem *spacerItem1;
+    QPushButton *buttonOk;
+    QPushButton *buttonCancel;
+
+    void setupUi(QDialog *Config)
+    {
+        if (Config->objectName().isEmpty())
+            Config->setObjectName(QString::fromUtf8("Config"));
+        Config->resize(600, 650);
+        Config->setSizeGripEnabled(true);
+        vboxLayout = new QVBoxLayout(Config);
+        vboxLayout->setSpacing(6);
+        vboxLayout->setMargin(11);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setContentsMargins(8, 8, 8, 8);
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setSpacing(6);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
+        ButtonGroup1 = new QGroupBox(Config);
+        ButtonGroup1->setObjectName(QString::fromUtf8("ButtonGroup1"));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(ButtonGroup1->sizePolicy().hasHeightForWidth());
+        ButtonGroup1->setSizePolicy(sizePolicy);
+        vboxLayout1 = new QVBoxLayout(ButtonGroup1);
+        vboxLayout1->setSpacing(6);
+        vboxLayout1->setMargin(11);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setContentsMargins(11, 11, 11, 11);
+        size_176_220 = new QRadioButton(ButtonGroup1);
+        size_176_220->setObjectName(QString::fromUtf8("size_176_220"));
+
+        vboxLayout1->addWidget(size_176_220);
+
+        size_240_320 = new QRadioButton(ButtonGroup1);
+        size_240_320->setObjectName(QString::fromUtf8("size_240_320"));
+
+        vboxLayout1->addWidget(size_240_320);
+
+        size_320_240 = new QRadioButton(ButtonGroup1);
+        size_320_240->setObjectName(QString::fromUtf8("size_320_240"));
+
+        vboxLayout1->addWidget(size_320_240);
+
+        size_640_480 = new QRadioButton(ButtonGroup1);
+        size_640_480->setObjectName(QString::fromUtf8("size_640_480"));
+
+        vboxLayout1->addWidget(size_640_480);
+
+        size_800_600 = new QRadioButton(ButtonGroup1);
+        size_800_600->setObjectName(QString::fromUtf8("size_800_600"));
+
+        vboxLayout1->addWidget(size_800_600);
+
+        size_1024_768 = new QRadioButton(ButtonGroup1);
+        size_1024_768->setObjectName(QString::fromUtf8("size_1024_768"));
+
+        vboxLayout1->addWidget(size_1024_768);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setSpacing(6);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
+        size_custom = new QRadioButton(ButtonGroup1);
+        size_custom->setObjectName(QString::fromUtf8("size_custom"));
+        QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(size_custom->sizePolicy().hasHeightForWidth());
+        size_custom->setSizePolicy(sizePolicy1);
+
+        hboxLayout1->addWidget(size_custom);
+
+        size_width = new QSpinBox(ButtonGroup1);
+        size_width->setObjectName(QString::fromUtf8("size_width"));
+        size_width->setMinimum(1);
+        size_width->setMaximum(1280);
+        size_width->setSingleStep(16);
+        size_width->setValue(400);
+
+        hboxLayout1->addWidget(size_width);
+
+        size_height = new QSpinBox(ButtonGroup1);
+        size_height->setObjectName(QString::fromUtf8("size_height"));
+        size_height->setMinimum(1);
+        size_height->setMaximum(1024);
+        size_height->setSingleStep(16);
+        size_height->setValue(300);
+
+        hboxLayout1->addWidget(size_height);
+
+
+        vboxLayout1->addLayout(hboxLayout1);
+
+
+        hboxLayout->addWidget(ButtonGroup1);
+
+        ButtonGroup2 = new QGroupBox(Config);
+        ButtonGroup2->setObjectName(QString::fromUtf8("ButtonGroup2"));
+        vboxLayout2 = new QVBoxLayout(ButtonGroup2);
+        vboxLayout2->setSpacing(6);
+        vboxLayout2->setMargin(11);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setContentsMargins(11, 11, 11, 11);
+        depth_1 = new QRadioButton(ButtonGroup2);
+        depth_1->setObjectName(QString::fromUtf8("depth_1"));
+
+        vboxLayout2->addWidget(depth_1);
+
+        depth_4gray = new QRadioButton(ButtonGroup2);
+        depth_4gray->setObjectName(QString::fromUtf8("depth_4gray"));
+
+        vboxLayout2->addWidget(depth_4gray);
+
+        depth_8 = new QRadioButton(ButtonGroup2);
+        depth_8->setObjectName(QString::fromUtf8("depth_8"));
+
+        vboxLayout2->addWidget(depth_8);
+
+        depth_12 = new QRadioButton(ButtonGroup2);
+        depth_12->setObjectName(QString::fromUtf8("depth_12"));
+
+        vboxLayout2->addWidget(depth_12);
+
+        depth_15 = new QRadioButton(ButtonGroup2);
+        depth_15->setObjectName(QString::fromUtf8("depth_15"));
+
+        vboxLayout2->addWidget(depth_15);
+
+        depth_16 = new QRadioButton(ButtonGroup2);
+        depth_16->setObjectName(QString::fromUtf8("depth_16"));
+
+        vboxLayout2->addWidget(depth_16);
+
+        depth_18 = new QRadioButton(ButtonGroup2);
+        depth_18->setObjectName(QString::fromUtf8("depth_18"));
+
+        vboxLayout2->addWidget(depth_18);
+
+        depth_24 = new QRadioButton(ButtonGroup2);
+        depth_24->setObjectName(QString::fromUtf8("depth_24"));
+
+        vboxLayout2->addWidget(depth_24);
+
+        depth_32 = new QRadioButton(ButtonGroup2);
+        depth_32->setObjectName(QString::fromUtf8("depth_32"));
+
+        vboxLayout2->addWidget(depth_32);
+
+        depth_32_argb = new QRadioButton(ButtonGroup2);
+        depth_32_argb->setObjectName(QString::fromUtf8("depth_32_argb"));
+
+        vboxLayout2->addWidget(depth_32_argb);
+
+
+        hboxLayout->addWidget(ButtonGroup2);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        hboxLayout2 = new QHBoxLayout();
+        hboxLayout2->setSpacing(6);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
+        TextLabel1_3 = new QLabel(Config);
+        TextLabel1_3->setObjectName(QString::fromUtf8("TextLabel1_3"));
+
+        hboxLayout2->addWidget(TextLabel1_3);
+
+        skin = new QComboBox(Config);
+        skin->setObjectName(QString::fromUtf8("skin"));
+        QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(skin->sizePolicy().hasHeightForWidth());
+        skin->setSizePolicy(sizePolicy2);
+
+        hboxLayout2->addWidget(skin);
+
+
+        vboxLayout->addLayout(hboxLayout2);
+
+        touchScreen = new QCheckBox(Config);
+        touchScreen->setObjectName(QString::fromUtf8("touchScreen"));
+
+        vboxLayout->addWidget(touchScreen);
+
+        lcdScreen = new QCheckBox(Config);
+        lcdScreen->setObjectName(QString::fromUtf8("lcdScreen"));
+
+        vboxLayout->addWidget(lcdScreen);
+
+        spacerItem = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(spacerItem);
+
+        TextLabel1 = new QLabel(Config);
+        TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+        sizePolicy.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth());
+        TextLabel1->setSizePolicy(sizePolicy);
+        TextLabel1->setWordWrap(true);
+
+        vboxLayout->addWidget(TextLabel1);
+
+        GroupBox1 = new QGroupBox(Config);
+        GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+        gridLayout = new QGridLayout(GroupBox1);
+        gridLayout->setSpacing(6);
+        gridLayout->setMargin(11);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setHorizontalSpacing(6);
+        gridLayout->setVerticalSpacing(6);
+        gridLayout->setContentsMargins(11, 11, 11, 11);
+        TextLabel3 = new QLabel(GroupBox1);
+        TextLabel3->setObjectName(QString::fromUtf8("TextLabel3"));
+
+        gridLayout->addWidget(TextLabel3, 6, 0, 1, 1);
+
+        bslider = new QSlider(GroupBox1);
+        bslider->setObjectName(QString::fromUtf8("bslider"));
+        QPalette palette;
+        QBrush brush(QColor(128, 128, 128, 255));
+        brush.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::WindowText, brush);
+        QBrush brush1(QColor(0, 0, 255, 255));
+        brush1.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Button, brush1);
+        QBrush brush2(QColor(127, 127, 255, 255));
+        brush2.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Light, brush2);
+        QBrush brush3(QColor(38, 38, 255, 255));
+        brush3.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Midlight, brush3);
+        QBrush brush4(QColor(0, 0, 127, 255));
+        brush4.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Dark, brush4);
+        QBrush brush5(QColor(0, 0, 170, 255));
+        brush5.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Mid, brush5);
+        QBrush brush6(QColor(0, 0, 0, 255));
+        brush6.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Text, brush6);
+        QBrush brush7(QColor(255, 255, 255, 255));
+        brush7.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::BrightText, brush7);
+        palette.setBrush(QPalette::Active, QPalette::ButtonText, brush);
+        palette.setBrush(QPalette::Active, QPalette::Base, brush7);
+        QBrush brush8(QColor(220, 220, 220, 255));
+        brush8.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Window, brush8);
+        palette.setBrush(QPalette::Active, QPalette::Shadow, brush6);
+        QBrush brush9(QColor(10, 95, 137, 255));
+        brush9.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::Highlight, brush9);
+        palette.setBrush(QPalette::Active, QPalette::HighlightedText, brush7);
+        palette.setBrush(QPalette::Active, QPalette::Link, brush6);
+        palette.setBrush(QPalette::Active, QPalette::LinkVisited, brush6);
+        QBrush brush10(QColor(232, 232, 232, 255));
+        brush10.setStyle(Qt::SolidPattern);
+        palette.setBrush(QPalette::Active, QPalette::AlternateBase, brush10);
+        palette.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
+        palette.setBrush(QPalette::Inactive, QPalette::Button, brush1);
+        palette.setBrush(QPalette::Inactive, QPalette::Light, brush2);
+        palette.setBrush(QPalette::Inactive, QPalette::Midlight, brush3);
+        palette.setBrush(QPalette::Inactive, QPalette::Dark, brush4);
+        palette.setBrush(QPalette::Inactive, QPalette::Mid, brush5);
+        palette.setBrush(QPalette::Inactive, QPalette::Text, brush6);
+        palette.setBrush(QPalette::Inactive, QPalette::BrightText, brush7);
+        palette.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
+        palette.setBrush(QPalette::Inactive, QPalette::Base, brush7);
+        palette.setBrush(QPalette::Inactive, QPalette::Window, brush8);
+        palette.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
+        palette.setBrush(QPalette::Inactive, QPalette::Highlight, brush9);
+        palette.setBrush(QPalette::Inactive, QPalette::HighlightedText, brush7);
+        palette.setBrush(QPalette::Inactive, QPalette::Link, brush6);
+        palette.setBrush(QPalette::Inactive, QPalette::LinkVisited, brush6);
+        palette.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush10);
+        palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush);
+        palette.setBrush(QPalette::Disabled, QPalette::Button, brush1);
+        palette.setBrush(QPalette::Disabled, QPalette::Light, brush2);
+        palette.setBrush(QPalette::Disabled, QPalette::Midlight, brush3);
+        palette.setBrush(QPalette::Disabled, QPalette::Dark, brush4);
+        palette.setBrush(QPalette::Disabled, QPalette::Mid, brush5);
+        palette.setBrush(QPalette::Disabled, QPalette::Text, brush6);
+        palette.setBrush(QPalette::Disabled, QPalette::BrightText, brush7);
+        palette.setBrush(QPalette::Disabled, QPalette::ButtonText, brush);
+        palette.setBrush(QPalette::Disabled, QPalette::Base, brush7);
+        palette.setBrush(QPalette::Disabled, QPalette::Window, brush8);
+        palette.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
+        palette.setBrush(QPalette::Disabled, QPalette::Highlight, brush9);
+        palette.setBrush(QPalette::Disabled, QPalette::HighlightedText, brush7);
+        palette.setBrush(QPalette::Disabled, QPalette::Link, brush6);
+        palette.setBrush(QPalette::Disabled, QPalette::LinkVisited, brush6);
+        palette.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush10);
+        bslider->setPalette(palette);
+        bslider->setMaximum(400);
+        bslider->setValue(100);
+        bslider->setOrientation(Qt::Horizontal);
+
+        gridLayout->addWidget(bslider, 6, 1, 1, 1);
+
+        blabel = new QLabel(GroupBox1);
+        blabel->setObjectName(QString::fromUtf8("blabel"));
+
+        gridLayout->addWidget(blabel, 6, 2, 1, 1);
+
+        TextLabel2 = new QLabel(GroupBox1);
+        TextLabel2->setObjectName(QString::fromUtf8("TextLabel2"));
+
+        gridLayout->addWidget(TextLabel2, 4, 0, 1, 1);
+
+        gslider = new QSlider(GroupBox1);
+        gslider->setObjectName(QString::fromUtf8("gslider"));
+        QPalette palette1;
+        palette1.setBrush(QPalette::Active, QPalette::WindowText, brush);
+        QBrush brush11(QColor(0, 255, 0, 255));
+        brush11.setStyle(Qt::SolidPattern);
+        palette1.setBrush(QPalette::Active, QPalette::Button, brush11);
+        QBrush brush12(QColor(127, 255, 127, 255));
+        brush12.setStyle(Qt::SolidPattern);
+        palette1.setBrush(QPalette::Active, QPalette::Light, brush12);
+        QBrush brush13(QColor(38, 255, 38, 255));
+        brush13.setStyle(Qt::SolidPattern);
+        palette1.setBrush(QPalette::Active, QPalette::Midlight, brush13);
+        QBrush brush14(QColor(0, 127, 0, 255));
+        brush14.setStyle(Qt::SolidPattern);
+        palette1.setBrush(QPalette::Active, QPalette::Dark, brush14);
+        QBrush brush15(QColor(0, 170, 0, 255));
+        brush15.setStyle(Qt::SolidPattern);
+        palette1.setBrush(QPalette::Active, QPalette::Mid, brush15);
+        palette1.setBrush(QPalette::Active, QPalette::Text, brush6);
+        palette1.setBrush(QPalette::Active, QPalette::BrightText, brush7);
+        palette1.setBrush(QPalette::Active, QPalette::ButtonText, brush);
+        palette1.setBrush(QPalette::Active, QPalette::Base, brush7);
+        palette1.setBrush(QPalette::Active, QPalette::Window, brush8);
+        palette1.setBrush(QPalette::Active, QPalette::Shadow, brush6);
+        palette1.setBrush(QPalette::Active, QPalette::Highlight, brush9);
+        palette1.setBrush(QPalette::Active, QPalette::HighlightedText, brush7);
+        palette1.setBrush(QPalette::Active, QPalette::Link, brush6);
+        palette1.setBrush(QPalette::Active, QPalette::LinkVisited, brush6);
+        palette1.setBrush(QPalette::Active, QPalette::AlternateBase, brush10);
+        palette1.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
+        palette1.setBrush(QPalette::Inactive, QPalette::Button, brush11);
+        palette1.setBrush(QPalette::Inactive, QPalette::Light, brush12);
+        palette1.setBrush(QPalette::Inactive, QPalette::Midlight, brush13);
+        palette1.setBrush(QPalette::Inactive, QPalette::Dark, brush14);
+        palette1.setBrush(QPalette::Inactive, QPalette::Mid, brush15);
+        palette1.setBrush(QPalette::Inactive, QPalette::Text, brush6);
+        palette1.setBrush(QPalette::Inactive, QPalette::BrightText, brush7);
+        palette1.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
+        palette1.setBrush(QPalette::Inactive, QPalette::Base, brush7);
+        palette1.setBrush(QPalette::Inactive, QPalette::Window, brush8);
+        palette1.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
+        palette1.setBrush(QPalette::Inactive, QPalette::Highlight, brush9);
+        palette1.setBrush(QPalette::Inactive, QPalette::HighlightedText, brush7);
+        palette1.setBrush(QPalette::Inactive, QPalette::Link, brush6);
+        palette1.setBrush(QPalette::Inactive, QPalette::LinkVisited, brush6);
+        palette1.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush10);
+        palette1.setBrush(QPalette::Disabled, QPalette::WindowText, brush);
+        palette1.setBrush(QPalette::Disabled, QPalette::Button, brush11);
+        palette1.setBrush(QPalette::Disabled, QPalette::Light, brush12);
+        palette1.setBrush(QPalette::Disabled, QPalette::Midlight, brush13);
+        palette1.setBrush(QPalette::Disabled, QPalette::Dark, brush14);
+        palette1.setBrush(QPalette::Disabled, QPalette::Mid, brush15);
+        palette1.setBrush(QPalette::Disabled, QPalette::Text, brush6);
+        palette1.setBrush(QPalette::Disabled, QPalette::BrightText, brush7);
+        palette1.setBrush(QPalette::Disabled, QPalette::ButtonText, brush);
+        palette1.setBrush(QPalette::Disabled, QPalette::Base, brush7);
+        palette1.setBrush(QPalette::Disabled, QPalette::Window, brush8);
+        palette1.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
+        palette1.setBrush(QPalette::Disabled, QPalette::Highlight, brush9);
+        palette1.setBrush(QPalette::Disabled, QPalette::HighlightedText, brush7);
+        palette1.setBrush(QPalette::Disabled, QPalette::Link, brush6);
+        palette1.setBrush(QPalette::Disabled, QPalette::LinkVisited, brush6);
+        palette1.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush10);
+        gslider->setPalette(palette1);
+        gslider->setMaximum(400);
+        gslider->setValue(100);
+        gslider->setOrientation(Qt::Horizontal);
+
+        gridLayout->addWidget(gslider, 4, 1, 1, 1);
+
+        glabel = new QLabel(GroupBox1);
+        glabel->setObjectName(QString::fromUtf8("glabel"));
+
+        gridLayout->addWidget(glabel, 4, 2, 1, 1);
+
+        TextLabel7 = new QLabel(GroupBox1);
+        TextLabel7->setObjectName(QString::fromUtf8("TextLabel7"));
+
+        gridLayout->addWidget(TextLabel7, 0, 0, 1, 1);
+
+        TextLabel8 = new QLabel(GroupBox1);
+        TextLabel8->setObjectName(QString::fromUtf8("TextLabel8"));
+
+        gridLayout->addWidget(TextLabel8, 0, 2, 1, 1);
+
+        gammaslider = new QSlider(GroupBox1);
+        gammaslider->setObjectName(QString::fromUtf8("gammaslider"));
+        QPalette palette2;
+        palette2.setBrush(QPalette::Active, QPalette::WindowText, brush);
+        palette2.setBrush(QPalette::Active, QPalette::Button, brush7);
+        palette2.setBrush(QPalette::Active, QPalette::Light, brush7);
+        palette2.setBrush(QPalette::Active, QPalette::Midlight, brush7);
+        QBrush brush16(QColor(127, 127, 127, 255));
+        brush16.setStyle(Qt::SolidPattern);
+        palette2.setBrush(QPalette::Active, QPalette::Dark, brush16);
+        QBrush brush17(QColor(170, 170, 170, 255));
+        brush17.setStyle(Qt::SolidPattern);
+        palette2.setBrush(QPalette::Active, QPalette::Mid, brush17);
+        palette2.setBrush(QPalette::Active, QPalette::Text, brush6);
+        palette2.setBrush(QPalette::Active, QPalette::BrightText, brush7);
+        palette2.setBrush(QPalette::Active, QPalette::ButtonText, brush);
+        palette2.setBrush(QPalette::Active, QPalette::Base, brush7);
+        palette2.setBrush(QPalette::Active, QPalette::Window, brush8);
+        palette2.setBrush(QPalette::Active, QPalette::Shadow, brush6);
+        palette2.setBrush(QPalette::Active, QPalette::Highlight, brush9);
+        palette2.setBrush(QPalette::Active, QPalette::HighlightedText, brush7);
+        palette2.setBrush(QPalette::Active, QPalette::Link, brush6);
+        palette2.setBrush(QPalette::Active, QPalette::LinkVisited, brush6);
+        palette2.setBrush(QPalette::Active, QPalette::AlternateBase, brush10);
+        palette2.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
+        palette2.setBrush(QPalette::Inactive, QPalette::Button, brush7);
+        palette2.setBrush(QPalette::Inactive, QPalette::Light, brush7);
+        palette2.setBrush(QPalette::Inactive, QPalette::Midlight, brush7);
+        palette2.setBrush(QPalette::Inactive, QPalette::Dark, brush16);
+        palette2.setBrush(QPalette::Inactive, QPalette::Mid, brush17);
+        palette2.setBrush(QPalette::Inactive, QPalette::Text, brush6);
+        palette2.setBrush(QPalette::Inactive, QPalette::BrightText, brush7);
+        palette2.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
+        palette2.setBrush(QPalette::Inactive, QPalette::Base, brush7);
+        palette2.setBrush(QPalette::Inactive, QPalette::Window, brush8);
+        palette2.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
+        palette2.setBrush(QPalette::Inactive, QPalette::Highlight, brush9);
+        palette2.setBrush(QPalette::Inactive, QPalette::HighlightedText, brush7);
+        palette2.setBrush(QPalette::Inactive, QPalette::Link, brush6);
+        palette2.setBrush(QPalette::Inactive, QPalette::LinkVisited, brush6);
+        palette2.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush10);
+        palette2.setBrush(QPalette::Disabled, QPalette::WindowText, brush);
+        palette2.setBrush(QPalette::Disabled, QPalette::Button, brush7);
+        palette2.setBrush(QPalette::Disabled, QPalette::Light, brush7);
+        palette2.setBrush(QPalette::Disabled, QPalette::Midlight, brush7);
+        palette2.setBrush(QPalette::Disabled, QPalette::Dark, brush16);
+        palette2.setBrush(QPalette::Disabled, QPalette::Mid, brush17);
+        palette2.setBrush(QPalette::Disabled, QPalette::Text, brush6);
+        palette2.setBrush(QPalette::Disabled, QPalette::BrightText, brush7);
+        palette2.setBrush(QPalette::Disabled, QPalette::ButtonText, brush);
+        palette2.setBrush(QPalette::Disabled, QPalette::Base, brush7);
+        palette2.setBrush(QPalette::Disabled, QPalette::Window, brush8);
+        palette2.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
+        palette2.setBrush(QPalette::Disabled, QPalette::Highlight, brush9);
+        palette2.setBrush(QPalette::Disabled, QPalette::HighlightedText, brush7);
+        palette2.setBrush(QPalette::Disabled, QPalette::Link, brush6);
+        palette2.setBrush(QPalette::Disabled, QPalette::LinkVisited, brush6);
+        palette2.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush10);
+        gammaslider->setPalette(palette2);
+        gammaslider->setMaximum(400);
+        gammaslider->setValue(100);
+        gammaslider->setOrientation(Qt::Horizontal);
+
+        gridLayout->addWidget(gammaslider, 0, 1, 1, 1);
+
+        TextLabel1_2 = new QLabel(GroupBox1);
+        TextLabel1_2->setObjectName(QString::fromUtf8("TextLabel1_2"));
+
+        gridLayout->addWidget(TextLabel1_2, 2, 0, 1, 1);
+
+        rlabel = new QLabel(GroupBox1);
+        rlabel->setObjectName(QString::fromUtf8("rlabel"));
+
+        gridLayout->addWidget(rlabel, 2, 2, 1, 1);
+
+        rslider = new QSlider(GroupBox1);
+        rslider->setObjectName(QString::fromUtf8("rslider"));
+        QPalette palette3;
+        palette3.setBrush(QPalette::Active, QPalette::WindowText, brush);
+        QBrush brush18(QColor(255, 0, 0, 255));
+        brush18.setStyle(Qt::SolidPattern);
+        palette3.setBrush(QPalette::Active, QPalette::Button, brush18);
+        QBrush brush19(QColor(255, 127, 127, 255));
+        brush19.setStyle(Qt::SolidPattern);
+        palette3.setBrush(QPalette::Active, QPalette::Light, brush19);
+        QBrush brush20(QColor(255, 38, 38, 255));
+        brush20.setStyle(Qt::SolidPattern);
+        palette3.setBrush(QPalette::Active, QPalette::Midlight, brush20);
+        QBrush brush21(QColor(127, 0, 0, 255));
+        brush21.setStyle(Qt::SolidPattern);
+        palette3.setBrush(QPalette::Active, QPalette::Dark, brush21);
+        QBrush brush22(QColor(170, 0, 0, 255));
+        brush22.setStyle(Qt::SolidPattern);
+        palette3.setBrush(QPalette::Active, QPalette::Mid, brush22);
+        palette3.setBrush(QPalette::Active, QPalette::Text, brush6);
+        palette3.setBrush(QPalette::Active, QPalette::BrightText, brush7);
+        palette3.setBrush(QPalette::Active, QPalette::ButtonText, brush);
+        palette3.setBrush(QPalette::Active, QPalette::Base, brush7);
+        palette3.setBrush(QPalette::Active, QPalette::Window, brush8);
+        palette3.setBrush(QPalette::Active, QPalette::Shadow, brush6);
+        palette3.setBrush(QPalette::Active, QPalette::Highlight, brush9);
+        palette3.setBrush(QPalette::Active, QPalette::HighlightedText, brush7);
+        palette3.setBrush(QPalette::Active, QPalette::Link, brush6);
+        palette3.setBrush(QPalette::Active, QPalette::LinkVisited, brush6);
+        palette3.setBrush(QPalette::Active, QPalette::AlternateBase, brush10);
+        palette3.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
+        palette3.setBrush(QPalette::Inactive, QPalette::Button, brush18);
+        palette3.setBrush(QPalette::Inactive, QPalette::Light, brush19);
+        palette3.setBrush(QPalette::Inactive, QPalette::Midlight, brush20);
+        palette3.setBrush(QPalette::Inactive, QPalette::Dark, brush21);
+        palette3.setBrush(QPalette::Inactive, QPalette::Mid, brush22);
+        palette3.setBrush(QPalette::Inactive, QPalette::Text, brush6);
+        palette3.setBrush(QPalette::Inactive, QPalette::BrightText, brush7);
+        palette3.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
+        palette3.setBrush(QPalette::Inactive, QPalette::Base, brush7);
+        palette3.setBrush(QPalette::Inactive, QPalette::Window, brush8);
+        palette3.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
+        palette3.setBrush(QPalette::Inactive, QPalette::Highlight, brush9);
+        palette3.setBrush(QPalette::Inactive, QPalette::HighlightedText, brush7);
+        palette3.setBrush(QPalette::Inactive, QPalette::Link, brush6);
+        palette3.setBrush(QPalette::Inactive, QPalette::LinkVisited, brush6);
+        palette3.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush10);
+        palette3.setBrush(QPalette::Disabled, QPalette::WindowText, brush);
+        palette3.setBrush(QPalette::Disabled, QPalette::Button, brush18);
+        palette3.setBrush(QPalette::Disabled, QPalette::Light, brush19);
+        palette3.setBrush(QPalette::Disabled, QPalette::Midlight, brush20);
+        palette3.setBrush(QPalette::Disabled, QPalette::Dark, brush21);
+        palette3.setBrush(QPalette::Disabled, QPalette::Mid, brush22);
+        palette3.setBrush(QPalette::Disabled, QPalette::Text, brush6);
+        palette3.setBrush(QPalette::Disabled, QPalette::BrightText, brush7);
+        palette3.setBrush(QPalette::Disabled, QPalette::ButtonText, brush);
+        palette3.setBrush(QPalette::Disabled, QPalette::Base, brush7);
+        palette3.setBrush(QPalette::Disabled, QPalette::Window, brush8);
+        palette3.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
+        palette3.setBrush(QPalette::Disabled, QPalette::Highlight, brush9);
+        palette3.setBrush(QPalette::Disabled, QPalette::HighlightedText, brush7);
+        palette3.setBrush(QPalette::Disabled, QPalette::Link, brush6);
+        palette3.setBrush(QPalette::Disabled, QPalette::LinkVisited, brush6);
+        palette3.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush10);
+        rslider->setPalette(palette3);
+        rslider->setMaximum(400);
+        rslider->setValue(100);
+        rslider->setOrientation(Qt::Horizontal);
+
+        gridLayout->addWidget(rslider, 2, 1, 1, 1);
+
+        PushButton3 = new QPushButton(GroupBox1);
+        PushButton3->setObjectName(QString::fromUtf8("PushButton3"));
+
+        gridLayout->addWidget(PushButton3, 8, 0, 1, 3);
+
+        MyCustomWidget1 = new GammaView(GroupBox1);
+        MyCustomWidget1->setObjectName(QString::fromUtf8("MyCustomWidget1"));
+
+        gridLayout->addWidget(MyCustomWidget1, 0, 3, 9, 1);
+
+
+        vboxLayout->addWidget(GroupBox1);
+
+        hboxLayout3 = new QHBoxLayout();
+        hboxLayout3->setSpacing(6);
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout3->addItem(spacerItem1);
+
+        buttonOk = new QPushButton(Config);
+        buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
+        buttonOk->setAutoDefault(true);
+        buttonOk->setDefault(true);
+
+        hboxLayout3->addWidget(buttonOk);
+
+        buttonCancel = new QPushButton(Config);
+        buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+        buttonCancel->setAutoDefault(true);
+
+        hboxLayout3->addWidget(buttonCancel);
+
+
+        vboxLayout->addLayout(hboxLayout3);
+
+
+        retranslateUi(Config);
+        QObject::connect(size_width, SIGNAL(valueChanged(int)), size_custom, SLOT(click()));
+        QObject::connect(size_height, SIGNAL(valueChanged(int)), size_custom, SLOT(click()));
+
+        QMetaObject::connectSlotsByName(Config);
+    } // setupUi
+
+    void retranslateUi(QDialog *Config)
+    {
+        Config->setWindowTitle(QApplication::translate("Config", "Configure", 0, QApplication::UnicodeUTF8));
+        ButtonGroup1->setTitle(QApplication::translate("Config", "Size", 0, QApplication::UnicodeUTF8));
+        size_176_220->setText(QApplication::translate("Config", "176x220 \"SmartPhone\"", 0, QApplication::UnicodeUTF8));
+        size_240_320->setText(QApplication::translate("Config", "240x320 \"PDA\"", 0, QApplication::UnicodeUTF8));
+        size_320_240->setText(QApplication::translate("Config", "320x240 \"TV\" / \"QVGA\"", 0, QApplication::UnicodeUTF8));
+        size_640_480->setText(QApplication::translate("Config", "640x480 \"VGA\"", 0, QApplication::UnicodeUTF8));
+        size_800_600->setText(QApplication::translate("Config", "800x600", 0, QApplication::UnicodeUTF8));
+        size_1024_768->setText(QApplication::translate("Config", "1024x768", 0, QApplication::UnicodeUTF8));
+        size_custom->setText(QApplication::translate("Config", "Custom", 0, QApplication::UnicodeUTF8));
+        ButtonGroup2->setTitle(QApplication::translate("Config", "Depth", 0, QApplication::UnicodeUTF8));
+        depth_1->setText(QApplication::translate("Config", "1 bit monochrome", 0, QApplication::UnicodeUTF8));
+        depth_4gray->setText(QApplication::translate("Config", "4 bit grayscale", 0, QApplication::UnicodeUTF8));
+        depth_8->setText(QApplication::translate("Config", "8 bit", 0, QApplication::UnicodeUTF8));
+        depth_12->setText(QApplication::translate("Config", "12 (16) bit", 0, QApplication::UnicodeUTF8));
+        depth_15->setText(QApplication::translate("Config", "15 bit", 0, QApplication::UnicodeUTF8));
+        depth_16->setText(QApplication::translate("Config", "16 bit", 0, QApplication::UnicodeUTF8));
+        depth_18->setText(QApplication::translate("Config", "18 bit", 0, QApplication::UnicodeUTF8));
+        depth_24->setText(QApplication::translate("Config", "24 bit", 0, QApplication::UnicodeUTF8));
+        depth_32->setText(QApplication::translate("Config", "32 bit", 0, QApplication::UnicodeUTF8));
+        depth_32_argb->setText(QApplication::translate("Config", "32 bit ARGB", 0, QApplication::UnicodeUTF8));
+        TextLabel1_3->setText(QApplication::translate("Config", "Skin", 0, QApplication::UnicodeUTF8));
+        skin->clear();
+        skin->insertItems(0, QStringList()
+         << QApplication::translate("Config", "None", 0, QApplication::UnicodeUTF8)
+        );
+        touchScreen->setText(QApplication::translate("Config", "Emulate touch screen (no mouse move)", 0, QApplication::UnicodeUTF8));
+        lcdScreen->setText(QApplication::translate("Config", "Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)", 0, QApplication::UnicodeUTF8));
+        TextLabel1->setText(QApplication::translate("Config", "<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>.", 0, QApplication::UnicodeUTF8));
+        GroupBox1->setTitle(QApplication::translate("Config", "Gamma", 0, QApplication::UnicodeUTF8));
+        TextLabel3->setText(QApplication::translate("Config", "Blue", 0, QApplication::UnicodeUTF8));
+        blabel->setText(QApplication::translate("Config", "1.0", 0, QApplication::UnicodeUTF8));
+        TextLabel2->setText(QApplication::translate("Config", "Green", 0, QApplication::UnicodeUTF8));
+        glabel->setText(QApplication::translate("Config", "1.0", 0, QApplication::UnicodeUTF8));
+        TextLabel7->setText(QApplication::translate("Config", "All", 0, QApplication::UnicodeUTF8));
+        TextLabel8->setText(QApplication::translate("Config", "1.0", 0, QApplication::UnicodeUTF8));
+        TextLabel1_2->setText(QApplication::translate("Config", "Red", 0, QApplication::UnicodeUTF8));
+        rlabel->setText(QApplication::translate("Config", "1.0", 0, QApplication::UnicodeUTF8));
+        PushButton3->setText(QApplication::translate("Config", "Set all to 1.0", 0, QApplication::UnicodeUTF8));
+        buttonOk->setText(QApplication::translate("Config", "&OK", 0, QApplication::UnicodeUTF8));
+        buttonCancel->setText(QApplication::translate("Config", "&Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Config);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Config: public Ui_Config {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CONFIG_H
diff --git a/tests/auto/uic/baseline/connectdialog.ui b/tests/auto/uic/baseline/connectdialog.ui
new file mode 100644
index 0000000..bd062eb
--- /dev/null
+++ b/tests/auto/uic/baseline/connectdialog.ui
@@ -0,0 +1,150 @@
+<ui version="4.0" >
+ <class>ConnectDialog</class>
+ <widget class="QDialog" name="ConnectDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>585</width>
+    <height>361</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Configure Connection</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <widget class="QGroupBox" name="signalGroupBox" >
+     <property name="title" >
+      <string>GroupBox</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QListWidget" name="signalList" >
+        <property name="textElideMode" >
+         <enum>Qt::ElideMiddle</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QToolButton" name="editSignalsButton" >
+          <property name="text" >
+           <string>Edit...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="2" >
+    <widget class="QGroupBox" name="slotGroupBox" >
+     <property name="title" >
+      <string>GroupBox</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QListWidget" name="slotList" >
+        <property name="textElideMode" >
+         <enum>Qt::ElideMiddle</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QToolButton" name="editSlotsButton" >
+          <property name="text" >
+           <string>Edit...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QCheckBox" name="showAllCheckBox" >
+     <property name="text" >
+      <string>Show signals and slots inherited from QWidget</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ConnectDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ConnectDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/connectdialog.ui.h b/tests/auto/uic/baseline/connectdialog.ui.h
new file mode 100644
index 0000000..b90de56
--- /dev/null
+++ b/tests/auto/uic/baseline/connectdialog.ui.h
@@ -0,0 +1,150 @@
+/********************************************************************************
+** Form generated from reading ui file 'connectdialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CONNECTDIALOG_H
+#define CONNECTDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_ConnectDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *signalGroupBox;
+    QVBoxLayout *vboxLayout;
+    QListWidget *signalList;
+    QHBoxLayout *hboxLayout;
+    QToolButton *editSignalsButton;
+    QSpacerItem *spacerItem;
+    QGroupBox *slotGroupBox;
+    QVBoxLayout *vboxLayout1;
+    QListWidget *slotList;
+    QHBoxLayout *hboxLayout1;
+    QToolButton *editSlotsButton;
+    QSpacerItem *spacerItem1;
+    QCheckBox *showAllCheckBox;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *ConnectDialog)
+    {
+        if (ConnectDialog->objectName().isEmpty())
+            ConnectDialog->setObjectName(QString::fromUtf8("ConnectDialog"));
+        ConnectDialog->resize(585, 361);
+        gridLayout = new QGridLayout(ConnectDialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        signalGroupBox = new QGroupBox(ConnectDialog);
+        signalGroupBox->setObjectName(QString::fromUtf8("signalGroupBox"));
+        vboxLayout = new QVBoxLayout(signalGroupBox);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        signalList = new QListWidget(signalGroupBox);
+        signalList->setObjectName(QString::fromUtf8("signalList"));
+        signalList->setTextElideMode(Qt::ElideMiddle);
+
+        vboxLayout->addWidget(signalList);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        editSignalsButton = new QToolButton(signalGroupBox);
+        editSignalsButton->setObjectName(QString::fromUtf8("editSignalsButton"));
+
+        hboxLayout->addWidget(editSignalsButton);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+
+        gridLayout->addWidget(signalGroupBox, 0, 0, 1, 2);
+
+        slotGroupBox = new QGroupBox(ConnectDialog);
+        slotGroupBox->setObjectName(QString::fromUtf8("slotGroupBox"));
+        vboxLayout1 = new QVBoxLayout(slotGroupBox);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        slotList = new QListWidget(slotGroupBox);
+        slotList->setObjectName(QString::fromUtf8("slotList"));
+        slotList->setTextElideMode(Qt::ElideMiddle);
+
+        vboxLayout1->addWidget(slotList);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        editSlotsButton = new QToolButton(slotGroupBox);
+        editSlotsButton->setObjectName(QString::fromUtf8("editSlotsButton"));
+
+        hboxLayout1->addWidget(editSlotsButton);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem1);
+
+
+        vboxLayout1->addLayout(hboxLayout1);
+
+
+        gridLayout->addWidget(slotGroupBox, 0, 2, 1, 1);
+
+        showAllCheckBox = new QCheckBox(ConnectDialog);
+        showAllCheckBox->setObjectName(QString::fromUtf8("showAllCheckBox"));
+
+        gridLayout->addWidget(showAllCheckBox, 1, 0, 1, 1);
+
+        buttonBox = new QDialogButtonBox(ConnectDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 2, 1, 1, 2);
+
+
+        retranslateUi(ConnectDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), ConnectDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), ConnectDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(ConnectDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *ConnectDialog)
+    {
+        ConnectDialog->setWindowTitle(QApplication::translate("ConnectDialog", "Configure Connection", 0, QApplication::UnicodeUTF8));
+        signalGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", 0, QApplication::UnicodeUTF8));
+        editSignalsButton->setText(QApplication::translate("ConnectDialog", "Edit...", 0, QApplication::UnicodeUTF8));
+        slotGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", 0, QApplication::UnicodeUTF8));
+        editSlotsButton->setText(QApplication::translate("ConnectDialog", "Edit...", 0, QApplication::UnicodeUTF8));
+        showAllCheckBox->setText(QApplication::translate("ConnectDialog", "Show signals and slots inherited from QWidget", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(ConnectDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class ConnectDialog: public Ui_ConnectDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CONNECTDIALOG_H
diff --git a/tests/auto/uic/baseline/controller.ui b/tests/auto/uic/baseline/controller.ui
new file mode 100644
index 0000000..379015b
--- /dev/null
+++ b/tests/auto/uic/baseline/controller.ui
@@ -0,0 +1,64 @@
+<ui version="4.0" >
+ <class>Controller</class>
+ <widget class="QWidget" name="Controller" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>255</width>
+    <height>111</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Controller</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="1" column="1" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Controller</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QPushButton" name="decelerate" >
+     <property name="text" >
+      <string>Decelerate</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QPushButton" name="accelerate" >
+     <property name="text" >
+      <string>Accelerate</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QPushButton" name="right" >
+     <property name="text" >
+      <string>Right</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QPushButton" name="left" >
+     <property name="text" >
+      <string>Left</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/controller.ui.h b/tests/auto/uic/baseline/controller.ui.h
new file mode 100644
index 0000000..b5f20b7
--- /dev/null
+++ b/tests/auto/uic/baseline/controller.ui.h
@@ -0,0 +1,99 @@
+/********************************************************************************
+** Form generated from reading ui file 'controller.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef CONTROLLER_H
+#define CONTROLLER_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Controller
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QPushButton *decelerate;
+    QPushButton *accelerate;
+    QPushButton *right;
+    QPushButton *left;
+
+    void setupUi(QWidget *Controller)
+    {
+        if (Controller->objectName().isEmpty())
+            Controller->setObjectName(QString::fromUtf8("Controller"));
+        Controller->resize(255, 111);
+        gridLayout = new QGridLayout(Controller);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(Controller);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setAlignment(Qt::AlignCenter);
+
+        gridLayout->addWidget(label, 1, 1, 1, 1);
+
+        decelerate = new QPushButton(Controller);
+        decelerate->setObjectName(QString::fromUtf8("decelerate"));
+
+        gridLayout->addWidget(decelerate, 2, 1, 1, 1);
+
+        accelerate = new QPushButton(Controller);
+        accelerate->setObjectName(QString::fromUtf8("accelerate"));
+
+        gridLayout->addWidget(accelerate, 0, 1, 1, 1);
+
+        right = new QPushButton(Controller);
+        right->setObjectName(QString::fromUtf8("right"));
+
+        gridLayout->addWidget(right, 1, 2, 1, 1);
+
+        left = new QPushButton(Controller);
+        left->setObjectName(QString::fromUtf8("left"));
+
+        gridLayout->addWidget(left, 1, 0, 1, 1);
+
+
+        retranslateUi(Controller);
+
+        QMetaObject::connectSlotsByName(Controller);
+    } // setupUi
+
+    void retranslateUi(QWidget *Controller)
+    {
+        Controller->setWindowTitle(QApplication::translate("Controller", "Controller", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("Controller", "Controller", 0, QApplication::UnicodeUTF8));
+        decelerate->setText(QApplication::translate("Controller", "Decelerate", 0, QApplication::UnicodeUTF8));
+        accelerate->setText(QApplication::translate("Controller", "Accelerate", 0, QApplication::UnicodeUTF8));
+        right->setText(QApplication::translate("Controller", "Right", 0, QApplication::UnicodeUTF8));
+        left->setText(QApplication::translate("Controller", "Left", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Controller);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Controller: public Ui_Controller {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // CONTROLLER_H
diff --git a/tests/auto/uic/baseline/cookies.ui b/tests/auto/uic/baseline/cookies.ui
new file mode 100644
index 0000000..c4bccc5
--- /dev/null
+++ b/tests/auto/uic/baseline/cookies.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>CookiesDialog</class>
+ <widget class="QDialog" name="CookiesDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>550</width>
+    <height>370</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Cookies</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTableView" name="cookiesTable" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeAllButton" >
+       <property name="text" >
+        <string>Remove &amp;All Cookies</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CookiesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/cookies.ui.h b/tests/auto/uic/baseline/cookies.ui.h
new file mode 100644
index 0000000..e4c70ec
--- /dev/null
+++ b/tests/auto/uic/baseline/cookies.ui.h
@@ -0,0 +1,111 @@
+/********************************************************************************
+** Form generated from reading ui file 'cookies.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef COOKIES_H
+#define COOKIES_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include "edittableview.h"
+#include "searchlineedit.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_CookiesDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QSpacerItem *spacerItem;
+    SearchLineEdit *search;
+    EditTableView *cookiesTable;
+    QHBoxLayout *hboxLayout;
+    QPushButton *removeButton;
+    QPushButton *removeAllButton;
+    QSpacerItem *spacerItem1;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *CookiesDialog)
+    {
+        if (CookiesDialog->objectName().isEmpty())
+            CookiesDialog->setObjectName(QString::fromUtf8("CookiesDialog"));
+        CookiesDialog->resize(550, 370);
+        gridLayout = new QGridLayout(CookiesDialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        spacerItem = new QSpacerItem(252, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 0, 0, 1, 1);
+
+        search = new SearchLineEdit(CookiesDialog);
+        search->setObjectName(QString::fromUtf8("search"));
+
+        gridLayout->addWidget(search, 0, 1, 1, 1);
+
+        cookiesTable = new EditTableView(CookiesDialog);
+        cookiesTable->setObjectName(QString::fromUtf8("cookiesTable"));
+
+        gridLayout->addWidget(cookiesTable, 1, 0, 1, 2);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        removeButton = new QPushButton(CookiesDialog);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+
+        hboxLayout->addWidget(removeButton);
+
+        removeAllButton = new QPushButton(CookiesDialog);
+        removeAllButton->setObjectName(QString::fromUtf8("removeAllButton"));
+
+        hboxLayout->addWidget(removeAllButton);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem1);
+
+        buttonBox = new QDialogButtonBox(CookiesDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setStandardButtons(QDialogButtonBox::Ok);
+
+        hboxLayout->addWidget(buttonBox);
+
+
+        gridLayout->addLayout(hboxLayout, 2, 0, 1, 2);
+
+
+        retranslateUi(CookiesDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), CookiesDialog, SLOT(accept()));
+
+        QMetaObject::connectSlotsByName(CookiesDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *CookiesDialog)
+    {
+        CookiesDialog->setWindowTitle(QApplication::translate("CookiesDialog", "Cookies", 0, QApplication::UnicodeUTF8));
+        removeButton->setText(QApplication::translate("CookiesDialog", "&Remove", 0, QApplication::UnicodeUTF8));
+        removeAllButton->setText(QApplication::translate("CookiesDialog", "Remove &All Cookies", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(CookiesDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class CookiesDialog: public Ui_CookiesDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // COOKIES_H
diff --git a/tests/auto/uic/baseline/cookiesexceptions.ui b/tests/auto/uic/baseline/cookiesexceptions.ui
new file mode 100644
index 0000000..3d9ef62
--- /dev/null
+++ b/tests/auto/uic/baseline/cookiesexceptions.ui
@@ -0,0 +1,184 @@
+<ui version="4.0" >
+ <class>CookiesExceptionsDialog</class>
+ <widget class="QDialog" name="CookiesExceptionsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>466</width>
+    <height>446</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Cookie Exceptions</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="newExceptionGroupBox" >
+     <property name="title" >
+      <string>New Exception</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>Domain:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="domainLineEdit" />
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>81</width>
+            <height>25</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="blockButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Block</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="allowForSessionButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Allow For Session</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="allowButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Allow</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="ExceptionsGroupBox" >
+     <property name="title" >
+      <string>Exceptions</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="3" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>252</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3" >
+       <widget class="SearchLineEdit" name="search" />
+      </item>
+      <item row="1" column="0" colspan="4" >
+       <widget class="EditTableView" name="exceptionTable" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QPushButton" name="removeButton" >
+        <property name="text" >
+         <string>&amp;Remove</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="removeAllButton" >
+        <property name="text" >
+         <string>Remove &amp;All</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CookiesExceptionsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>381</x>
+     <y>428</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>336</x>
+     <y>443</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/cookiesexceptions.ui.h b/tests/auto/uic/baseline/cookiesexceptions.ui.h
new file mode 100644
index 0000000..5a436eb
--- /dev/null
+++ b/tests/auto/uic/baseline/cookiesexceptions.ui.h
@@ -0,0 +1,184 @@
+/********************************************************************************
+** Form generated from reading ui file 'cookiesexceptions.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef COOKIESEXCEPTIONS_H
+#define COOKIESEXCEPTIONS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+#include "edittableview.h"
+#include "searchlineedit.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_CookiesExceptionsDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *newExceptionGroupBox;
+    QGridLayout *gridLayout;
+    QHBoxLayout *hboxLayout;
+    QLabel *label;
+    QLineEdit *domainLineEdit;
+    QHBoxLayout *hboxLayout1;
+    QSpacerItem *spacerItem;
+    QPushButton *blockButton;
+    QPushButton *allowForSessionButton;
+    QPushButton *allowButton;
+    QGroupBox *ExceptionsGroupBox;
+    QGridLayout *gridLayout1;
+    QSpacerItem *spacerItem1;
+    SearchLineEdit *search;
+    EditTableView *exceptionTable;
+    QPushButton *removeButton;
+    QPushButton *removeAllButton;
+    QSpacerItem *spacerItem2;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *CookiesExceptionsDialog)
+    {
+        if (CookiesExceptionsDialog->objectName().isEmpty())
+            CookiesExceptionsDialog->setObjectName(QString::fromUtf8("CookiesExceptionsDialog"));
+        CookiesExceptionsDialog->resize(466, 446);
+        vboxLayout = new QVBoxLayout(CookiesExceptionsDialog);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        newExceptionGroupBox = new QGroupBox(CookiesExceptionsDialog);
+        newExceptionGroupBox->setObjectName(QString::fromUtf8("newExceptionGroupBox"));
+        gridLayout = new QGridLayout(newExceptionGroupBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        label = new QLabel(newExceptionGroupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        hboxLayout->addWidget(label);
+
+        domainLineEdit = new QLineEdit(newExceptionGroupBox);
+        domainLineEdit->setObjectName(QString::fromUtf8("domainLineEdit"));
+
+        hboxLayout->addWidget(domainLineEdit);
+
+
+        gridLayout->addLayout(hboxLayout, 0, 0, 1, 1);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        spacerItem = new QSpacerItem(81, 25, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem);
+
+        blockButton = new QPushButton(newExceptionGroupBox);
+        blockButton->setObjectName(QString::fromUtf8("blockButton"));
+        blockButton->setEnabled(false);
+
+        hboxLayout1->addWidget(blockButton);
+
+        allowForSessionButton = new QPushButton(newExceptionGroupBox);
+        allowForSessionButton->setObjectName(QString::fromUtf8("allowForSessionButton"));
+        allowForSessionButton->setEnabled(false);
+
+        hboxLayout1->addWidget(allowForSessionButton);
+
+        allowButton = new QPushButton(newExceptionGroupBox);
+        allowButton->setObjectName(QString::fromUtf8("allowButton"));
+        allowButton->setEnabled(false);
+
+        hboxLayout1->addWidget(allowButton);
+
+
+        gridLayout->addLayout(hboxLayout1, 1, 0, 1, 1);
+
+
+        vboxLayout->addWidget(newExceptionGroupBox);
+
+        ExceptionsGroupBox = new QGroupBox(CookiesExceptionsDialog);
+        ExceptionsGroupBox->setObjectName(QString::fromUtf8("ExceptionsGroupBox"));
+        gridLayout1 = new QGridLayout(ExceptionsGroupBox);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        spacerItem1 = new QSpacerItem(252, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout1->addItem(spacerItem1, 0, 0, 1, 3);
+
+        search = new SearchLineEdit(ExceptionsGroupBox);
+        search->setObjectName(QString::fromUtf8("search"));
+
+        gridLayout1->addWidget(search, 0, 3, 1, 1);
+
+        exceptionTable = new EditTableView(ExceptionsGroupBox);
+        exceptionTable->setObjectName(QString::fromUtf8("exceptionTable"));
+
+        gridLayout1->addWidget(exceptionTable, 1, 0, 1, 4);
+
+        removeButton = new QPushButton(ExceptionsGroupBox);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+
+        gridLayout1->addWidget(removeButton, 2, 0, 1, 1);
+
+        removeAllButton = new QPushButton(ExceptionsGroupBox);
+        removeAllButton->setObjectName(QString::fromUtf8("removeAllButton"));
+
+        gridLayout1->addWidget(removeAllButton, 2, 1, 1, 1);
+
+        spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout1->addItem(spacerItem2, 2, 2, 1, 2);
+
+
+        vboxLayout->addWidget(ExceptionsGroupBox);
+
+        buttonBox = new QDialogButtonBox(CookiesExceptionsDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(CookiesExceptionsDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), CookiesExceptionsDialog, SLOT(accept()));
+
+        QMetaObject::connectSlotsByName(CookiesExceptionsDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *CookiesExceptionsDialog)
+    {
+        CookiesExceptionsDialog->setWindowTitle(QApplication::translate("CookiesExceptionsDialog", "Cookie Exceptions", 0, QApplication::UnicodeUTF8));
+        newExceptionGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "New Exception", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("CookiesExceptionsDialog", "Domain:", 0, QApplication::UnicodeUTF8));
+        blockButton->setText(QApplication::translate("CookiesExceptionsDialog", "Block", 0, QApplication::UnicodeUTF8));
+        allowForSessionButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow For Session", 0, QApplication::UnicodeUTF8));
+        allowButton->setText(QApplication::translate("CookiesExceptionsDialog", "Allow", 0, QApplication::UnicodeUTF8));
+        ExceptionsGroupBox->setTitle(QApplication::translate("CookiesExceptionsDialog", "Exceptions", 0, QApplication::UnicodeUTF8));
+        removeButton->setText(QApplication::translate("CookiesExceptionsDialog", "&Remove", 0, QApplication::UnicodeUTF8));
+        removeAllButton->setText(QApplication::translate("CookiesExceptionsDialog", "Remove &All", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(CookiesExceptionsDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class CookiesExceptionsDialog: public Ui_CookiesExceptionsDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // COOKIESEXCEPTIONS_H
diff --git a/tests/auto/uic/baseline/default.ui b/tests/auto/uic/baseline/default.ui
new file mode 100644
index 0000000..431a409
--- /dev/null
+++ b/tests/auto/uic/baseline/default.ui
@@ -0,0 +1,329 @@
+<ui version="4.0" >
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>388</width>
+    <height>413</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QGridLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item row="0" column="0" >
+     <widget class="QLabel" name="nameLabel" >
+      <property name="text" >
+       <string>&amp;Name:</string>
+      </property>
+      <property name="buddy" >
+       <cstring>nameCombo</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1" colspan="3" >
+     <widget class="QComboBox" name="nameCombo" >
+      <property name="toolTip" >
+       <string>Specify your name</string>
+      </property>
+      <property name="editable" >
+       <bool>true</bool>
+      </property>
+      <property name="currentIndex" >
+       <number>-1</number>
+      </property>
+      <item>
+       <property name="text" >
+        <string>Girish</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Jasmin</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Simon</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Zack</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="1" column="3" >
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="1" column="2" >
+     <widget class="QRadioButton" name="femaleRadioButton" >
+      <property name="toolTip" >
+       <string>Check this if you are female</string>
+      </property>
+      <property name="text" >
+       <string>&amp;Female</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="0" colspan="4" >
+     <widget class="QCheckBox" name="agreeCheckBox" >
+      <property name="toolTip" >
+       <string>Please read the license before checking this</string>
+      </property>
+      <property name="text" >
+       <string>I &amp;accept the terms and conditions</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1" >
+     <widget class="QRadioButton" name="maleRadioButton" >
+      <property name="toolTip" >
+       <string>Check this if you are male</string>
+      </property>
+      <property name="text" >
+       <string>&amp;Male</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" >
+     <widget class="QLabel" name="genderLabel" >
+      <property name="text" >
+       <string>Gender:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1" colspan="3" >
+     <widget class="QSpinBox" name="ageSpinBox" >
+      <property name="toolTip" >
+       <string>Specify your age</string>
+      </property>
+      <property name="statusTip" >
+       <string>Specify your age here</string>
+      </property>
+      <property name="minimum" >
+       <number>12</number>
+      </property>
+      <property name="value" >
+       <number>22</number>
+      </property>
+     </widget>
+    </item>
+    <item row="7" column="2" colspan="2" >
+     <widget class="QDialogButtonBox" name="buttonBox" >
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="standardButtons" >
+       <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0" >
+     <widget class="QLabel" name="ageLabel" >
+      <property name="text" >
+       <string>&amp;Age:</string>
+      </property>
+      <property name="buddy" >
+       <cstring>ageSpinBox</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0" >
+     <widget class="QLabel" name="passwordLabel" >
+      <property name="text" >
+       <string>&amp;Password:</string>
+      </property>
+      <property name="buddy" >
+       <cstring>passwordEdit</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1" colspan="3" >
+     <widget class="QLineEdit" name="passwordEdit" >
+      <property name="toolTip" >
+       <string>Specify your password</string>
+      </property>
+      <property name="statusTip" >
+       <string>Specify your password here</string>
+      </property>
+      <property name="text" >
+       <string>Password</string>
+      </property>
+      <property name="echoMode" >
+       <enum>QLineEdit::Password</enum>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="0" >
+     <widget class="QLabel" name="label" >
+      <property name="text" >
+       <string>Profession</string>
+      </property>
+      <property name="buddy" >
+       <cstring>professionList</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="0" >
+     <widget class="QLabel" name="countryLabel" >
+      <property name="text" >
+       <string>&amp;Country</string>
+      </property>
+      <property name="buddy" >
+       <cstring>professionList</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="1" colspan="3" >
+     <widget class="QListWidget" name="professionList" >
+      <property name="toolTip" >
+       <string>Select your profession</string>
+      </property>
+      <property name="statusTip" >
+       <string>Select your profession</string>
+      </property>
+      <property name="whatsThis" >
+       <string>Select your profession</string>
+      </property>
+      <property name="currentRow" >
+       <number>1</number>
+      </property>
+      <item>
+       <property name="text" >
+        <string>Developer</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Student</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Fisherman</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="4" column="1" colspan="3" >
+     <widget class="QComboBox" name="countryCombo" >
+      <property name="toolTip" >
+       <string>Specify your country</string>
+      </property>
+      <property name="statusTip" >
+       <string>Specify your country here</string>
+      </property>
+      <property name="currentIndex" >
+       <number>2</number>
+      </property>
+      <item>
+       <property name="text" >
+        <string>Germany</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>India</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Norway</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>United States Of America</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>United Kingdom</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>388</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_File" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <addaction name="editStyleAction" />
+    <addaction name="separator" />
+    <addaction name="exitAction" />
+   </widget>
+   <widget class="QMenu" name="menu_Help" >
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="aboutAction" />
+    <addaction name="separator" />
+    <addaction name="aboutQtAction" />
+   </widget>
+   <addaction name="menu_File" />
+   <addaction name="menu_Help" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <action name="exitAction" >
+   <property name="text" >
+    <string>&amp;Exit</string>
+   </property>
+  </action>
+  <action name="aboutQtAction" >
+   <property name="text" >
+    <string>About Qt</string>
+   </property>
+  </action>
+  <action name="editStyleAction" >
+   <property name="text" >
+    <string>Edit &amp;Style</string>
+   </property>
+  </action>
+  <action name="aboutAction" >
+   <property name="text" >
+    <string>About</string>
+   </property>
+  </action>
+ </widget>
+ <tabstops>
+  <tabstop>maleRadioButton</tabstop>
+  <tabstop>femaleRadioButton</tabstop>
+  <tabstop>ageSpinBox</tabstop>
+  <tabstop>passwordEdit</tabstop>
+  <tabstop>professionList</tabstop>
+  <tabstop>agreeCheckBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/default.ui.h b/tests/auto/uic/baseline/default.ui.h
new file mode 100644
index 0000000..1769630
--- /dev/null
+++ b/tests/auto/uic/baseline/default.ui.h
@@ -0,0 +1,315 @@
+/********************************************************************************
+** Form generated from reading ui file 'default.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef DEFAULT_H
+#define DEFAULT_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListWidget>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QStatusBar>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWindow
+{
+public:
+    QAction *exitAction;
+    QAction *aboutQtAction;
+    QAction *editStyleAction;
+    QAction *aboutAction;
+    QWidget *centralwidget;
+    QGridLayout *gridLayout;
+    QLabel *nameLabel;
+    QComboBox *nameCombo;
+    QSpacerItem *spacerItem;
+    QRadioButton *femaleRadioButton;
+    QCheckBox *agreeCheckBox;
+    QRadioButton *maleRadioButton;
+    QLabel *genderLabel;
+    QSpinBox *ageSpinBox;
+    QDialogButtonBox *buttonBox;
+    QLabel *ageLabel;
+    QLabel *passwordLabel;
+    QLineEdit *passwordEdit;
+    QLabel *label;
+    QLabel *countryLabel;
+    QListWidget *professionList;
+    QComboBox *countryCombo;
+    QMenuBar *menubar;
+    QMenu *menu_File;
+    QMenu *menu_Help;
+    QStatusBar *statusbar;
+
+    void setupUi(QMainWindow *MainWindow)
+    {
+        if (MainWindow->objectName().isEmpty())
+            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
+        MainWindow->resize(388, 413);
+        exitAction = new QAction(MainWindow);
+        exitAction->setObjectName(QString::fromUtf8("exitAction"));
+        aboutQtAction = new QAction(MainWindow);
+        aboutQtAction->setObjectName(QString::fromUtf8("aboutQtAction"));
+        editStyleAction = new QAction(MainWindow);
+        editStyleAction->setObjectName(QString::fromUtf8("editStyleAction"));
+        aboutAction = new QAction(MainWindow);
+        aboutAction->setObjectName(QString::fromUtf8("aboutAction"));
+        centralwidget = new QWidget(MainWindow);
+        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
+        gridLayout = new QGridLayout(centralwidget);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        nameLabel = new QLabel(centralwidget);
+        nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
+
+        gridLayout->addWidget(nameLabel, 0, 0, 1, 1);
+
+        nameCombo = new QComboBox(centralwidget);
+        nameCombo->setObjectName(QString::fromUtf8("nameCombo"));
+        nameCombo->setEditable(true);
+
+        gridLayout->addWidget(nameCombo, 0, 1, 1, 3);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 1, 3, 1, 1);
+
+        femaleRadioButton = new QRadioButton(centralwidget);
+        femaleRadioButton->setObjectName(QString::fromUtf8("femaleRadioButton"));
+
+        gridLayout->addWidget(femaleRadioButton, 1, 2, 1, 1);
+
+        agreeCheckBox = new QCheckBox(centralwidget);
+        agreeCheckBox->setObjectName(QString::fromUtf8("agreeCheckBox"));
+
+        gridLayout->addWidget(agreeCheckBox, 6, 0, 1, 4);
+
+        maleRadioButton = new QRadioButton(centralwidget);
+        maleRadioButton->setObjectName(QString::fromUtf8("maleRadioButton"));
+
+        gridLayout->addWidget(maleRadioButton, 1, 1, 1, 1);
+
+        genderLabel = new QLabel(centralwidget);
+        genderLabel->setObjectName(QString::fromUtf8("genderLabel"));
+
+        gridLayout->addWidget(genderLabel, 1, 0, 1, 1);
+
+        ageSpinBox = new QSpinBox(centralwidget);
+        ageSpinBox->setObjectName(QString::fromUtf8("ageSpinBox"));
+        ageSpinBox->setMinimum(12);
+        ageSpinBox->setValue(22);
+
+        gridLayout->addWidget(ageSpinBox, 2, 1, 1, 3);
+
+        buttonBox = new QDialogButtonBox(centralwidget);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 7, 2, 1, 2);
+
+        ageLabel = new QLabel(centralwidget);
+        ageLabel->setObjectName(QString::fromUtf8("ageLabel"));
+
+        gridLayout->addWidget(ageLabel, 2, 0, 1, 1);
+
+        passwordLabel = new QLabel(centralwidget);
+        passwordLabel->setObjectName(QString::fromUtf8("passwordLabel"));
+
+        gridLayout->addWidget(passwordLabel, 3, 0, 1, 1);
+
+        passwordEdit = new QLineEdit(centralwidget);
+        passwordEdit->setObjectName(QString::fromUtf8("passwordEdit"));
+        passwordEdit->setEchoMode(QLineEdit::Password);
+
+        gridLayout->addWidget(passwordEdit, 3, 1, 1, 3);
+
+        label = new QLabel(centralwidget);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 5, 0, 1, 1);
+
+        countryLabel = new QLabel(centralwidget);
+        countryLabel->setObjectName(QString::fromUtf8("countryLabel"));
+
+        gridLayout->addWidget(countryLabel, 4, 0, 1, 1);
+
+        professionList = new QListWidget(centralwidget);
+        new QListWidgetItem(professionList);
+        new QListWidgetItem(professionList);
+        new QListWidgetItem(professionList);
+        professionList->setObjectName(QString::fromUtf8("professionList"));
+
+        gridLayout->addWidget(professionList, 5, 1, 1, 3);
+
+        countryCombo = new QComboBox(centralwidget);
+        countryCombo->setObjectName(QString::fromUtf8("countryCombo"));
+
+        gridLayout->addWidget(countryCombo, 4, 1, 1, 3);
+
+        MainWindow->setCentralWidget(centralwidget);
+        menubar = new QMenuBar(MainWindow);
+        menubar->setObjectName(QString::fromUtf8("menubar"));
+        menubar->setGeometry(QRect(0, 0, 388, 21));
+        menu_File = new QMenu(menubar);
+        menu_File->setObjectName(QString::fromUtf8("menu_File"));
+        menu_Help = new QMenu(menubar);
+        menu_Help->setObjectName(QString::fromUtf8("menu_Help"));
+        MainWindow->setMenuBar(menubar);
+        statusbar = new QStatusBar(MainWindow);
+        statusbar->setObjectName(QString::fromUtf8("statusbar"));
+        MainWindow->setStatusBar(statusbar);
+#ifndef QT_NO_SHORTCUT
+        nameLabel->setBuddy(nameCombo);
+        ageLabel->setBuddy(ageSpinBox);
+        passwordLabel->setBuddy(passwordEdit);
+        label->setBuddy(professionList);
+        countryLabel->setBuddy(professionList);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(maleRadioButton, femaleRadioButton);
+        QWidget::setTabOrder(femaleRadioButton, ageSpinBox);
+        QWidget::setTabOrder(ageSpinBox, passwordEdit);
+        QWidget::setTabOrder(passwordEdit, professionList);
+        QWidget::setTabOrder(professionList, agreeCheckBox);
+
+        menubar->addAction(menu_File->menuAction());
+        menubar->addAction(menu_Help->menuAction());
+        menu_File->addAction(editStyleAction);
+        menu_File->addSeparator();
+        menu_File->addAction(exitAction);
+        menu_Help->addAction(aboutAction);
+        menu_Help->addSeparator();
+        menu_Help->addAction(aboutQtAction);
+
+        retranslateUi(MainWindow);
+
+        nameCombo->setCurrentIndex(-1);
+        professionList->setCurrentRow(1);
+        countryCombo->setCurrentIndex(2);
+
+
+        QMetaObject::connectSlotsByName(MainWindow);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *MainWindow)
+    {
+        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+        exitAction->setText(QApplication::translate("MainWindow", "&Exit", 0, QApplication::UnicodeUTF8));
+        aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", 0, QApplication::UnicodeUTF8));
+        editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", 0, QApplication::UnicodeUTF8));
+        aboutAction->setText(QApplication::translate("MainWindow", "About", 0, QApplication::UnicodeUTF8));
+        nameLabel->setText(QApplication::translate("MainWindow", "&Name:", 0, QApplication::UnicodeUTF8));
+        nameCombo->clear();
+        nameCombo->insertItems(0, QStringList()
+         << QApplication::translate("MainWindow", "Girish", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Jasmin", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Simon", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Zack", 0, QApplication::UnicodeUTF8)
+        );
+#ifndef QT_NO_TOOLTIP
+        nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", 0, QApplication::UnicodeUTF8));
+        genderLabel->setText(QApplication::translate("MainWindow", "Gender:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+        ageLabel->setText(QApplication::translate("MainWindow", "&Age:", 0, QApplication::UnicodeUTF8));
+        passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+        passwordEdit->setText(QApplication::translate("MainWindow", "Password", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("MainWindow", "Profession", 0, QApplication::UnicodeUTF8));
+        countryLabel->setText(QApplication::translate("MainWindow", "&Country", 0, QApplication::UnicodeUTF8));
+
+        const bool __sortingEnabled = professionList->isSortingEnabled();
+        professionList->setSortingEnabled(false);
+        QListWidgetItem *___qlistwidgetitem = professionList->item(0);
+        ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", 0, QApplication::UnicodeUTF8));
+        QListWidgetItem *___qlistwidgetitem1 = professionList->item(1);
+        ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", 0, QApplication::UnicodeUTF8));
+        QListWidgetItem *___qlistwidgetitem2 = professionList->item(2);
+        ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", 0, QApplication::UnicodeUTF8));
+        professionList->setSortingEnabled(__sortingEnabled);
+
+#ifndef QT_NO_TOOLTIP
+        professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+#ifndef QT_NO_WHATSTHIS
+        professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        countryCombo->clear();
+        countryCombo->insertItems(0, QStringList()
+         << QApplication::translate("MainWindow", "Germany", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "India", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Norway", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "United States Of America", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "United Kingdom", 0, QApplication::UnicodeUTF8)
+        );
+#ifndef QT_NO_TOOLTIP
+        countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+        menu_File->setTitle(QApplication::translate("MainWindow", "&File", 0, QApplication::UnicodeUTF8));
+        menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class MainWindow: public Ui_MainWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // DEFAULT_H
diff --git a/tests/auto/uic/baseline/dialog.ui b/tests/auto/uic/baseline/dialog.ui
new file mode 100644
index 0000000..e99d6fb
--- /dev/null
+++ b/tests/auto/uic/baseline/dialog.ui
@@ -0,0 +1,47 @@
+<ui version="4.0" >
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>451</width>
+    <height>322</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QPushButton" name="loadFromFileButton" >
+     <property name="text" >
+      <string>Load Image From File...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Launch two of these dialogs.  In the first, press the top button and load an image from a file.  In the second, press the bottom button and display the loaded image from shared memory.</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QPushButton" name="loadFromSharedMemoryButton" >
+     <property name="text" >
+      <string>Display Image From Shared Memory</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/dialog.ui.h b/tests/auto/uic/baseline/dialog.ui.h
new file mode 100644
index 0000000..307f2fc
--- /dev/null
+++ b/tests/auto/uic/baseline/dialog.ui.h
@@ -0,0 +1,80 @@
+/********************************************************************************
+** Form generated from reading ui file 'dialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Dialog
+{
+public:
+    QGridLayout *gridLayout;
+    QPushButton *loadFromFileButton;
+    QLabel *label;
+    QPushButton *loadFromSharedMemoryButton;
+
+    void setupUi(QDialog *Dialog)
+    {
+        if (Dialog->objectName().isEmpty())
+            Dialog->setObjectName(QString::fromUtf8("Dialog"));
+        Dialog->resize(451, 322);
+        gridLayout = new QGridLayout(Dialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        loadFromFileButton = new QPushButton(Dialog);
+        loadFromFileButton->setObjectName(QString::fromUtf8("loadFromFileButton"));
+
+        gridLayout->addWidget(loadFromFileButton, 0, 0, 1, 1);
+
+        label = new QLabel(Dialog);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setAlignment(Qt::AlignCenter);
+        label->setWordWrap(true);
+
+        gridLayout->addWidget(label, 1, 0, 1, 1);
+
+        loadFromSharedMemoryButton = new QPushButton(Dialog);
+        loadFromSharedMemoryButton->setObjectName(QString::fromUtf8("loadFromSharedMemoryButton"));
+
+        gridLayout->addWidget(loadFromSharedMemoryButton, 2, 0, 1, 1);
+
+
+        retranslateUi(Dialog);
+
+        QMetaObject::connectSlotsByName(Dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *Dialog)
+    {
+        Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
+        loadFromFileButton->setText(QApplication::translate("Dialog", "Load Image From File...", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("Dialog", "Launch two of these dialogs.  In the first, press the top button and load an image from a file.  In the second, press the bottom button and display the loaded image from shared memory.", 0, QApplication::UnicodeUTF8));
+        loadFromSharedMemoryButton->setText(QApplication::translate("Dialog", "Display Image From Shared Memory", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Dialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Dialog: public Ui_Dialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // DIALOG_H
diff --git a/tests/auto/uic/baseline/downloaditem.ui b/tests/auto/uic/baseline/downloaditem.ui
new file mode 100644
index 0000000..4a0a0fd
--- /dev/null
+++ b/tests/auto/uic/baseline/downloaditem.ui
@@ -0,0 +1,134 @@
+<ui version="4.0" >
+ <class>DownloadItem</class>
+ <widget class="QWidget" name="DownloadItem" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>423</width>
+    <height>110</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="fileIcon" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Ico</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2" >
+     <item>
+      <widget class="SqueezeLabel" native="1" name="fileNameLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" stdset="0" >
+        <string>Filename</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QProgressBar" name="progressBar" >
+       <property name="value" >
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SqueezeLabel" native="1" name="downloadInfoLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" stdset="0" >
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout" >
+     <item>
+      <spacer name="verticalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>17</width>
+         <height>1</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="tryAgainButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>Try Again</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="stopButton" >
+       <property name="text" >
+        <string>Stop</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="openButton" >
+       <property name="text" >
+        <string>Open</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>17</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SqueezeLabel</class>
+   <extends>QWidget</extends>
+   <header>squeezelabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/downloaditem.ui.h b/tests/auto/uic/baseline/downloaditem.ui.h
new file mode 100644
index 0000000..1d4c92f
--- /dev/null
+++ b/tests/auto/uic/baseline/downloaditem.ui.h
@@ -0,0 +1,149 @@
+/********************************************************************************
+** Form generated from reading ui file 'downloaditem.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef DOWNLOADITEM_H
+#define DOWNLOADITEM_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "squeezelabel.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_DownloadItem
+{
+public:
+    QHBoxLayout *horizontalLayout;
+    QLabel *fileIcon;
+    QVBoxLayout *verticalLayout_2;
+    SqueezeLabel *fileNameLabel;
+    QProgressBar *progressBar;
+    SqueezeLabel *downloadInfoLabel;
+    QVBoxLayout *verticalLayout;
+    QSpacerItem *verticalSpacer;
+    QPushButton *tryAgainButton;
+    QPushButton *stopButton;
+    QPushButton *openButton;
+    QSpacerItem *verticalSpacer_2;
+
+    void setupUi(QWidget *DownloadItem)
+    {
+        if (DownloadItem->objectName().isEmpty())
+            DownloadItem->setObjectName(QString::fromUtf8("DownloadItem"));
+        DownloadItem->resize(423, 110);
+        horizontalLayout = new QHBoxLayout(DownloadItem);
+        horizontalLayout->setMargin(0);
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        fileIcon = new QLabel(DownloadItem);
+        fileIcon->setObjectName(QString::fromUtf8("fileIcon"));
+        QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(fileIcon->sizePolicy().hasHeightForWidth());
+        fileIcon->setSizePolicy(sizePolicy);
+
+        horizontalLayout->addWidget(fileIcon);
+
+        verticalLayout_2 = new QVBoxLayout();
+        verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
+        fileNameLabel = new SqueezeLabel(DownloadItem);
+        fileNameLabel->setObjectName(QString::fromUtf8("fileNameLabel"));
+        QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Preferred);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(fileNameLabel->sizePolicy().hasHeightForWidth());
+        fileNameLabel->setSizePolicy(sizePolicy1);
+
+        verticalLayout_2->addWidget(fileNameLabel);
+
+        progressBar = new QProgressBar(DownloadItem);
+        progressBar->setObjectName(QString::fromUtf8("progressBar"));
+        progressBar->setValue(0);
+
+        verticalLayout_2->addWidget(progressBar);
+
+        downloadInfoLabel = new SqueezeLabel(DownloadItem);
+        downloadInfoLabel->setObjectName(QString::fromUtf8("downloadInfoLabel"));
+        QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Preferred);
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(downloadInfoLabel->sizePolicy().hasHeightForWidth());
+        downloadInfoLabel->setSizePolicy(sizePolicy2);
+
+        verticalLayout_2->addWidget(downloadInfoLabel);
+
+
+        horizontalLayout->addLayout(verticalLayout_2);
+
+        verticalLayout = new QVBoxLayout();
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        verticalSpacer = new QSpacerItem(17, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout->addItem(verticalSpacer);
+
+        tryAgainButton = new QPushButton(DownloadItem);
+        tryAgainButton->setObjectName(QString::fromUtf8("tryAgainButton"));
+        tryAgainButton->setEnabled(false);
+
+        verticalLayout->addWidget(tryAgainButton);
+
+        stopButton = new QPushButton(DownloadItem);
+        stopButton->setObjectName(QString::fromUtf8("stopButton"));
+
+        verticalLayout->addWidget(stopButton);
+
+        openButton = new QPushButton(DownloadItem);
+        openButton->setObjectName(QString::fromUtf8("openButton"));
+
+        verticalLayout->addWidget(openButton);
+
+        verticalSpacer_2 = new QSpacerItem(17, 5, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout->addItem(verticalSpacer_2);
+
+
+        horizontalLayout->addLayout(verticalLayout);
+
+
+        retranslateUi(DownloadItem);
+
+        QMetaObject::connectSlotsByName(DownloadItem);
+    } // setupUi
+
+    void retranslateUi(QWidget *DownloadItem)
+    {
+        DownloadItem->setWindowTitle(QApplication::translate("DownloadItem", "Form", 0, QApplication::UnicodeUTF8));
+        fileIcon->setText(QApplication::translate("DownloadItem", "Ico", 0, QApplication::UnicodeUTF8));
+        fileNameLabel->setProperty("text", QVariant(QApplication::translate("DownloadItem", "Filename", 0, QApplication::UnicodeUTF8)));
+        downloadInfoLabel->setProperty("text", QVariant(QString()));
+        tryAgainButton->setText(QApplication::translate("DownloadItem", "Try Again", 0, QApplication::UnicodeUTF8));
+        stopButton->setText(QApplication::translate("DownloadItem", "Stop", 0, QApplication::UnicodeUTF8));
+        openButton->setText(QApplication::translate("DownloadItem", "Open", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(DownloadItem);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class DownloadItem: public Ui_DownloadItem {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // DOWNLOADITEM_H
diff --git a/tests/auto/uic/baseline/downloads.ui b/tests/auto/uic/baseline/downloads.ui
new file mode 100644
index 0000000..a2e2569
--- /dev/null
+++ b/tests/auto/uic/baseline/downloads.ui
@@ -0,0 +1,83 @@
+<ui version="4.0" >
+ <class>DownloadDialog</class>
+ <widget class="QDialog" name="DownloadDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>332</width>
+    <height>252</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Downloads</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" colspan="3" >
+    <widget class="EditTableView" name="downloadsView" />
+   </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <widget class="QPushButton" name="cleanupButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>Clean up</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>58</width>
+         <height>24</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLabel" name="itemCount" >
+     <property name="text" >
+      <string>0 Items</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <spacer name="horizontalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>148</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/downloads.ui.h b/tests/auto/uic/baseline/downloads.ui.h
new file mode 100644
index 0000000..03f3aeb
--- /dev/null
+++ b/tests/auto/uic/baseline/downloads.ui.h
@@ -0,0 +1,99 @@
+/********************************************************************************
+** Form generated from reading ui file 'downloads.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef DOWNLOADS_H
+#define DOWNLOADS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include "edittableview.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_DownloadDialog
+{
+public:
+    QGridLayout *gridLayout;
+    EditTableView *downloadsView;
+    QHBoxLayout *horizontalLayout;
+    QPushButton *cleanupButton;
+    QSpacerItem *spacerItem;
+    QLabel *itemCount;
+    QSpacerItem *horizontalSpacer;
+
+    void setupUi(QDialog *DownloadDialog)
+    {
+        if (DownloadDialog->objectName().isEmpty())
+            DownloadDialog->setObjectName(QString::fromUtf8("DownloadDialog"));
+        DownloadDialog->resize(332, 252);
+        gridLayout = new QGridLayout(DownloadDialog);
+        gridLayout->setSpacing(0);
+        gridLayout->setMargin(0);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        downloadsView = new EditTableView(DownloadDialog);
+        downloadsView->setObjectName(QString::fromUtf8("downloadsView"));
+
+        gridLayout->addWidget(downloadsView, 0, 0, 1, 3);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        cleanupButton = new QPushButton(DownloadDialog);
+        cleanupButton->setObjectName(QString::fromUtf8("cleanupButton"));
+        cleanupButton->setEnabled(false);
+
+        horizontalLayout->addWidget(cleanupButton);
+
+        spacerItem = new QSpacerItem(58, 24, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(spacerItem);
+
+
+        gridLayout->addLayout(horizontalLayout, 1, 0, 1, 1);
+
+        itemCount = new QLabel(DownloadDialog);
+        itemCount->setObjectName(QString::fromUtf8("itemCount"));
+
+        gridLayout->addWidget(itemCount, 1, 1, 1, 1);
+
+        horizontalSpacer = new QSpacerItem(148, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(horizontalSpacer, 1, 2, 1, 1);
+
+
+        retranslateUi(DownloadDialog);
+
+        QMetaObject::connectSlotsByName(DownloadDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *DownloadDialog)
+    {
+        DownloadDialog->setWindowTitle(QApplication::translate("DownloadDialog", "Downloads", 0, QApplication::UnicodeUTF8));
+        cleanupButton->setText(QApplication::translate("DownloadDialog", "Clean up", 0, QApplication::UnicodeUTF8));
+        itemCount->setText(QApplication::translate("DownloadDialog", "0 Items", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(DownloadDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class DownloadDialog: public Ui_DownloadDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // DOWNLOADS_H
diff --git a/tests/auto/uic/baseline/embeddeddialog.ui b/tests/auto/uic/baseline/embeddeddialog.ui
new file mode 100644
index 0000000..f967b10
--- /dev/null
+++ b/tests/auto/uic/baseline/embeddeddialog.ui
@@ -0,0 +1,87 @@
+<ui version="4.0" >
+ <class>embeddedDialog</class>
+ <widget class="QDialog" name="embeddedDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>407</width>
+    <height>134</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Embedded Dialog</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Layout Direction:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>layoutDirection</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="layoutDirection" >
+     <item>
+      <property name="text" >
+       <string>Left to Right</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Right to Left</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Select Font:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QFontComboBox" name="fontComboBox" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Style:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>style</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QComboBox" name="style" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Layout spacing:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>spacing</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QSlider" name="spacing" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/embeddeddialog.ui.h b/tests/auto/uic/baseline/embeddeddialog.ui.h
new file mode 100644
index 0000000..7df8ab8
--- /dev/null
+++ b/tests/auto/uic/baseline/embeddeddialog.ui.h
@@ -0,0 +1,123 @@
+/********************************************************************************
+** Form generated from reading ui file 'embeddeddialog.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef EMBEDDEDDIALOG_H
+#define EMBEDDEDDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QFontComboBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QSlider>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_embeddedDialog
+{
+public:
+    QFormLayout *formLayout;
+    QLabel *label;
+    QComboBox *layoutDirection;
+    QLabel *label_2;
+    QFontComboBox *fontComboBox;
+    QLabel *label_3;
+    QComboBox *style;
+    QLabel *label_4;
+    QSlider *spacing;
+
+    void setupUi(QDialog *embeddedDialog)
+    {
+        if (embeddedDialog->objectName().isEmpty())
+            embeddedDialog->setObjectName(QString::fromUtf8("embeddedDialog"));
+        embeddedDialog->resize(407, 134);
+        formLayout = new QFormLayout(embeddedDialog);
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
+        label = new QLabel(embeddedDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+
+        layoutDirection = new QComboBox(embeddedDialog);
+        layoutDirection->setObjectName(QString::fromUtf8("layoutDirection"));
+
+        formLayout->setWidget(0, QFormLayout::FieldRole, layoutDirection);
+
+        label_2 = new QLabel(embeddedDialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+
+        fontComboBox = new QFontComboBox(embeddedDialog);
+        fontComboBox->setObjectName(QString::fromUtf8("fontComboBox"));
+
+        formLayout->setWidget(1, QFormLayout::FieldRole, fontComboBox);
+
+        label_3 = new QLabel(embeddedDialog);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        formLayout->setWidget(2, QFormLayout::LabelRole, label_3);
+
+        style = new QComboBox(embeddedDialog);
+        style->setObjectName(QString::fromUtf8("style"));
+
+        formLayout->setWidget(2, QFormLayout::FieldRole, style);
+
+        label_4 = new QLabel(embeddedDialog);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        formLayout->setWidget(3, QFormLayout::LabelRole, label_4);
+
+        spacing = new QSlider(embeddedDialog);
+        spacing->setObjectName(QString::fromUtf8("spacing"));
+        spacing->setOrientation(Qt::Horizontal);
+
+        formLayout->setWidget(3, QFormLayout::FieldRole, spacing);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(layoutDirection);
+        label_2->setBuddy(fontComboBox);
+        label_3->setBuddy(style);
+        label_4->setBuddy(spacing);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(embeddedDialog);
+
+        QMetaObject::connectSlotsByName(embeddedDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *embeddedDialog)
+    {
+        embeddedDialog->setWindowTitle(QApplication::translate("embeddedDialog", "Embedded Dialog", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("embeddedDialog", "Layout Direction:", 0, QApplication::UnicodeUTF8));
+        layoutDirection->clear();
+        layoutDirection->insertItems(0, QStringList()
+         << QApplication::translate("embeddedDialog", "Left to Right", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("embeddedDialog", "Right to Left", 0, QApplication::UnicodeUTF8)
+        );
+        label_2->setText(QApplication::translate("embeddedDialog", "Select Font:", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("embeddedDialog", "Style:", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("embeddedDialog", "Layout spacing:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(embeddedDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class embeddedDialog: public Ui_embeddedDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // EMBEDDEDDIALOG_H
diff --git a/tests/auto/uic/baseline/filespage.ui b/tests/auto/uic/baseline/filespage.ui
new file mode 100644
index 0000000..d308b96
--- /dev/null
+++ b/tests/auto/uic/baseline/filespage.ui
@@ -0,0 +1,79 @@
+<ui version="4.0" >
+ <class>FilesPage</class>
+ <widget class="QWidget" name="FilesPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>242</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <widget class="QLabel" name="fileLabel" >
+     <property name="text" >
+      <string>Files:</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item rowspan="3" row="1" column="0" >
+    <widget class="QListWidget" name="fileListWidget" />
+   </item>
+   <item row="1" column="1" >
+    <widget class="QPushButton" name="removeButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Remove</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QPushButton" name="removeAllButton" >
+     <property name="text" >
+      <string>Remove All</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>75</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/filespage.ui.h b/tests/auto/uic/baseline/filespage.ui.h
new file mode 100644
index 0000000..f946002
--- /dev/null
+++ b/tests/auto/uic/baseline/filespage.ui.h
@@ -0,0 +1,102 @@
+/********************************************************************************
+** Form generated from reading ui file 'filespage.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef FILESPAGE_H
+#define FILESPAGE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListWidget>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_FilesPage
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *fileLabel;
+    QListWidget *fileListWidget;
+    QPushButton *removeButton;
+    QPushButton *removeAllButton;
+    QSpacerItem *spacerItem;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QWidget *FilesPage)
+    {
+        if (FilesPage->objectName().isEmpty())
+            FilesPage->setObjectName(QString::fromUtf8("FilesPage"));
+        FilesPage->resize(417, 242);
+        gridLayout = new QGridLayout(FilesPage);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        fileLabel = new QLabel(FilesPage);
+        fileLabel->setObjectName(QString::fromUtf8("fileLabel"));
+        fileLabel->setWordWrap(true);
+
+        gridLayout->addWidget(fileLabel, 0, 0, 1, 2);
+
+        fileListWidget = new QListWidget(FilesPage);
+        fileListWidget->setObjectName(QString::fromUtf8("fileListWidget"));
+
+        gridLayout->addWidget(fileListWidget, 1, 0, 3, 1);
+
+        removeButton = new QPushButton(FilesPage);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+        QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(removeButton->sizePolicy().hasHeightForWidth());
+        removeButton->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(removeButton, 1, 1, 1, 1);
+
+        removeAllButton = new QPushButton(FilesPage);
+        removeAllButton->setObjectName(QString::fromUtf8("removeAllButton"));
+
+        gridLayout->addWidget(removeAllButton, 2, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(75, 16, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem, 3, 1, 1, 1);
+
+        spacerItem1 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem1, 4, 0, 1, 1);
+
+
+        retranslateUi(FilesPage);
+
+        QMetaObject::connectSlotsByName(FilesPage);
+    } // setupUi
+
+    void retranslateUi(QWidget *FilesPage)
+    {
+        FilesPage->setWindowTitle(QApplication::translate("FilesPage", "Form", 0, QApplication::UnicodeUTF8));
+        fileLabel->setText(QApplication::translate("FilesPage", "Files:", 0, QApplication::UnicodeUTF8));
+        removeButton->setText(QApplication::translate("FilesPage", "Remove", 0, QApplication::UnicodeUTF8));
+        removeAllButton->setText(QApplication::translate("FilesPage", "Remove All", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(FilesPage);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class FilesPage: public Ui_FilesPage {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // FILESPAGE_H
diff --git a/tests/auto/uic/baseline/filternamedialog.ui b/tests/auto/uic/baseline/filternamedialog.ui
new file mode 100644
index 0000000..be6f17d
--- /dev/null
+++ b/tests/auto/uic/baseline/filternamedialog.ui
@@ -0,0 +1,67 @@
+<ui version="4.0" >
+ <class>FilterNameDialogClass</class>
+ <widget class="QDialog" name="FilterNameDialogClass" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>312</width>
+    <height>95</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>FilterNameDialog</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Filter Name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLineEdit" name="lineEdit" />
+   </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/filternamedialog.ui.h b/tests/auto/uic/baseline/filternamedialog.ui.h
new file mode 100644
index 0000000..ce67607
--- /dev/null
+++ b/tests/auto/uic/baseline/filternamedialog.ui.h
@@ -0,0 +1,96 @@
+/********************************************************************************
+** Form generated from reading ui file 'filternamedialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef FILTERNAMEDIALOG_H
+#define FILTERNAMEDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_FilterNameDialogClass
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QLineEdit *lineEdit;
+    QFrame *line;
+    QSpacerItem *spacerItem;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *FilterNameDialogClass)
+    {
+        if (FilterNameDialogClass->objectName().isEmpty())
+            FilterNameDialogClass->setObjectName(QString::fromUtf8("FilterNameDialogClass"));
+        FilterNameDialogClass->resize(312, 95);
+        gridLayout = new QGridLayout(FilterNameDialogClass);
+        gridLayout->setSpacing(6);
+        gridLayout->setMargin(9);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(FilterNameDialogClass);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        lineEdit = new QLineEdit(FilterNameDialogClass);
+        lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
+
+        gridLayout->addWidget(lineEdit, 0, 1, 1, 2);
+
+        line = new QFrame(FilterNameDialogClass);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        gridLayout->addWidget(line, 1, 0, 1, 3);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 2, 0, 1, 2);
+
+        buttonBox = new QDialogButtonBox(FilterNameDialogClass);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 2, 2, 1, 1);
+
+
+        retranslateUi(FilterNameDialogClass);
+
+        QMetaObject::connectSlotsByName(FilterNameDialogClass);
+    } // setupUi
+
+    void retranslateUi(QDialog *FilterNameDialogClass)
+    {
+        FilterNameDialogClass->setWindowTitle(QApplication::translate("FilterNameDialogClass", "FilterNameDialog", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("FilterNameDialogClass", "Filter Name:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(FilterNameDialogClass);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class FilterNameDialogClass: public Ui_FilterNameDialogClass {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // FILTERNAMEDIALOG_H
diff --git a/tests/auto/uic/baseline/filterpage.ui b/tests/auto/uic/baseline/filterpage.ui
new file mode 100644
index 0000000..7cda3d9
--- /dev/null
+++ b/tests/auto/uic/baseline/filterpage.ui
@@ -0,0 +1,125 @@
+<ui version="4.0" >
+ <class>FilterPage</class>
+ <widget class="QWidget" name="FilterPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>419</width>
+    <height>243</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Filter attributes for current documentation (comma separated list):</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLineEdit" name="filterLineEdit" />
+   </item>
+   <item row="4" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Custom Filters</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item rowspan="3" row="0" column="0" >
+       <widget class="QTreeWidget" name="customFilterWidget" >
+        <property name="columnCount" >
+         <number>2</number>
+        </property>
+        <column>
+         <property name="text" >
+          <string>1</string>
+         </property>
+        </column>
+        <column>
+         <property name="text" >
+          <string>2</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="addButton" >
+        <property name="text" >
+         <string>Add</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="removeButton" >
+        <property name="text" >
+         <string>Remove</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/filterpage.ui.h b/tests/auto/uic/baseline/filterpage.ui.h
new file mode 100644
index 0000000..ebac375
--- /dev/null
+++ b/tests/auto/uic/baseline/filterpage.ui.h
@@ -0,0 +1,128 @@
+/********************************************************************************
+** Form generated from reading ui file 'filterpage.ui'
+**
+** Created: Mon Jun 16 17:58:59 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef FILTERPAGE_H
+#define FILTERPAGE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_FilterPage
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QLineEdit *filterLineEdit;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout1;
+    QTreeWidget *customFilterWidget;
+    QPushButton *addButton;
+    QPushButton *removeButton;
+    QSpacerItem *spacerItem;
+    QSpacerItem *spacerItem1;
+    QSpacerItem *spacerItem2;
+    QSpacerItem *spacerItem3;
+
+    void setupUi(QWidget *FilterPage)
+    {
+        if (FilterPage->objectName().isEmpty())
+            FilterPage->setObjectName(QString::fromUtf8("FilterPage"));
+        FilterPage->resize(419, 243);
+        gridLayout = new QGridLayout(FilterPage);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(FilterPage);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 1, 0, 1, 1);
+
+        filterLineEdit = new QLineEdit(FilterPage);
+        filterLineEdit->setObjectName(QString::fromUtf8("filterLineEdit"));
+
+        gridLayout->addWidget(filterLineEdit, 2, 0, 1, 1);
+
+        groupBox = new QGroupBox(FilterPage);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        gridLayout1 = new QGridLayout(groupBox);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        customFilterWidget = new QTreeWidget(groupBox);
+        customFilterWidget->setObjectName(QString::fromUtf8("customFilterWidget"));
+        customFilterWidget->setColumnCount(2);
+
+        gridLayout1->addWidget(customFilterWidget, 0, 0, 3, 1);
+
+        addButton = new QPushButton(groupBox);
+        addButton->setObjectName(QString::fromUtf8("addButton"));
+
+        gridLayout1->addWidget(addButton, 0, 1, 1, 1);
+
+        removeButton = new QPushButton(groupBox);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+
+        gridLayout1->addWidget(removeButton, 1, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout1->addItem(spacerItem, 2, 1, 1, 1);
+
+
+        gridLayout->addWidget(groupBox, 4, 0, 1, 1);
+
+        spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem1, 0, 0, 1, 1);
+
+        spacerItem2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem2, 5, 0, 1, 1);
+
+        spacerItem3 = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem3, 3, 0, 1, 1);
+
+
+        retranslateUi(FilterPage);
+
+        QMetaObject::connectSlotsByName(FilterPage);
+    } // setupUi
+
+    void retranslateUi(QWidget *FilterPage)
+    {
+        FilterPage->setWindowTitle(QApplication::translate("FilterPage", "Form", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("FilterPage", "Filter attributes for current documentation (comma separated list):", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("FilterPage", "Custom Filters", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = customFilterWidget->headerItem();
+        ___qtreewidgetitem->setText(1, QApplication::translate("FilterPage", "2", 0, QApplication::UnicodeUTF8));
+        ___qtreewidgetitem->setText(0, QApplication::translate("FilterPage", "1", 0, QApplication::UnicodeUTF8));
+        addButton->setText(QApplication::translate("FilterPage", "Add", 0, QApplication::UnicodeUTF8));
+        removeButton->setText(QApplication::translate("FilterPage", "Remove", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(FilterPage);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class FilterPage: public Ui_FilterPage {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // FILTERPAGE_H
diff --git a/tests/auto/uic/baseline/finddialog.ui b/tests/auto/uic/baseline/finddialog.ui
new file mode 100644
index 0000000..df0a303
--- /dev/null
+++ b/tests/auto/uic/baseline/finddialog.ui
@@ -0,0 +1,264 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>FindDialog</class>
+ <widget class="QDialog" name="FindDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>414</width>
+    <height>170</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Find</string>
+  </property>
+  <property name="whatsThis" >
+   <string>This window allows you to search for some text in the translation source file.</string>
+  </property>
+  <layout class="QHBoxLayout" >
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <property name="margin" >
+    <number>11</number>
+   </property>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="findWhat" >
+         <property name="text" >
+          <string>&amp;Find what:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>led</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="led" >
+         <property name="whatsThis" >
+          <string>Type in the text to search for.</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox" >
+       <property name="title" >
+        <string>Options</string>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item row="1" column="0" >
+         <widget class="QCheckBox" name="sourceText" >
+          <property name="whatsThis" >
+           <string>Source texts are searched when checked.</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Source texts</string>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" >
+         <widget class="QCheckBox" name="translations" >
+          <property name="whatsThis" >
+           <string>Translations are searched when checked.</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Translations</string>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QCheckBox" name="matchCase" >
+          <property name="whatsThis" >
+           <string>Texts such as 'TeX' and 'tex' are considered as different when checked.</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Match case</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="QCheckBox" name="comments" >
+          <property name="whatsThis" >
+           <string>Comments and contexts are searched when checked.</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Comments</string>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QCheckBox" name="ignoreAccelerators" >
+          <property name="text" >
+           <string>Ignore &amp;accelerators</string>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="findNxt" >
+       <property name="whatsThis" >
+        <string>Click here to find the next occurrence of the text you typed in.</string>
+       </property>
+       <property name="text" >
+        <string>Find Next</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+       <property name="flat" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancel" >
+       <property name="whatsThis" >
+        <string>Click here to close this window.</string>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>20</width>
+         <height>51</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <tabstops>
+  <tabstop>led</tabstop>
+  <tabstop>findNxt</tabstop>
+  <tabstop>cancel</tabstop>
+  <tabstop>comments</tabstop>
+  <tabstop>sourceText</tabstop>
+  <tabstop>translations</tabstop>
+  <tabstop>matchCase</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>cancel</sender>
+   <signal>clicked()</signal>
+   <receiver>FindDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>372</x>
+     <y>58</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>373</x>
+     <y>109</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/uic/baseline/finddialog.ui.h
new file mode 100644
index 0000000..a0c6c78
--- /dev/null
+++ b/tests/auto/uic/baseline/finddialog.ui.h
@@ -0,0 +1,255 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'finddialog.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef FINDDIALOG_H
+#define FINDDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_FindDialog
+{
+public:
+    QHBoxLayout *hboxLayout;
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout1;
+    QLabel *findWhat;
+    QLineEdit *led;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout;
+    QCheckBox *sourceText;
+    QCheckBox *translations;
+    QCheckBox *matchCase;
+    QCheckBox *comments;
+    QCheckBox *ignoreAccelerators;
+    QVBoxLayout *vboxLayout1;
+    QPushButton *findNxt;
+    QPushButton *cancel;
+    QSpacerItem *spacerItem;
+
+    void setupUi(QDialog *FindDialog)
+    {
+        if (FindDialog->objectName().isEmpty())
+            FindDialog->setObjectName(QString::fromUtf8("FindDialog"));
+        FindDialog->resize(414, 170);
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(FindDialog->sizePolicy().hasHeightForWidth());
+        FindDialog->setSizePolicy(sizePolicy);
+        hboxLayout = new QHBoxLayout(FindDialog);
+        hboxLayout->setSpacing(6);
+        hboxLayout->setMargin(11);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        vboxLayout = new QVBoxLayout();
+        vboxLayout->setSpacing(6);
+        vboxLayout->setMargin(0);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setSpacing(6);
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        findWhat = new QLabel(FindDialog);
+        findWhat->setObjectName(QString::fromUtf8("findWhat"));
+
+        hboxLayout1->addWidget(findWhat);
+
+        led = new QLineEdit(FindDialog);
+        led->setObjectName(QString::fromUtf8("led"));
+
+        hboxLayout1->addWidget(led);
+
+
+        vboxLayout->addLayout(hboxLayout1);
+
+        groupBox = new QGroupBox(FindDialog);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        gridLayout = new QGridLayout(groupBox);
+        gridLayout->setSpacing(6);
+        gridLayout->setMargin(9);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        sourceText = new QCheckBox(groupBox);
+        sourceText->setObjectName(QString::fromUtf8("sourceText"));
+        sourceText->setChecked(true);
+
+        gridLayout->addWidget(sourceText, 1, 0, 1, 1);
+
+        translations = new QCheckBox(groupBox);
+        translations->setObjectName(QString::fromUtf8("translations"));
+        translations->setChecked(true);
+
+        gridLayout->addWidget(translations, 2, 0, 1, 1);
+
+        matchCase = new QCheckBox(groupBox);
+        matchCase->setObjectName(QString::fromUtf8("matchCase"));
+
+        gridLayout->addWidget(matchCase, 0, 1, 1, 1);
+
+        comments = new QCheckBox(groupBox);
+        comments->setObjectName(QString::fromUtf8("comments"));
+        comments->setChecked(true);
+
+        gridLayout->addWidget(comments, 0, 0, 1, 1);
+
+        ignoreAccelerators = new QCheckBox(groupBox);
+        ignoreAccelerators->setObjectName(QString::fromUtf8("ignoreAccelerators"));
+        ignoreAccelerators->setChecked(true);
+
+        gridLayout->addWidget(ignoreAccelerators, 1, 1, 1, 1);
+
+
+        vboxLayout->addWidget(groupBox);
+
+
+        hboxLayout->addLayout(vboxLayout);
+
+        vboxLayout1 = new QVBoxLayout();
+        vboxLayout1->setSpacing(6);
+        vboxLayout1->setMargin(0);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        findNxt = new QPushButton(FindDialog);
+        findNxt->setObjectName(QString::fromUtf8("findNxt"));
+        findNxt->setDefault(true);
+        findNxt->setFlat(false);
+
+        vboxLayout1->addWidget(findNxt);
+
+        cancel = new QPushButton(FindDialog);
+        cancel->setObjectName(QString::fromUtf8("cancel"));
+
+        vboxLayout1->addWidget(cancel);
+
+        spacerItem = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout1->addItem(spacerItem);
+
+
+        hboxLayout->addLayout(vboxLayout1);
+
+#ifndef QT_NO_SHORTCUT
+        findWhat->setBuddy(led);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(led, findNxt);
+        QWidget::setTabOrder(findNxt, cancel);
+        QWidget::setTabOrder(cancel, comments);
+        QWidget::setTabOrder(comments, sourceText);
+        QWidget::setTabOrder(sourceText, translations);
+        QWidget::setTabOrder(translations, matchCase);
+
+        retranslateUi(FindDialog);
+        QObject::connect(cancel, SIGNAL(clicked()), FindDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(FindDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *FindDialog)
+    {
+        FindDialog->setWindowTitle(QApplication::translate("FindDialog", "Find", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        FindDialog->setWhatsThis(QApplication::translate("FindDialog", "This window allows you to search for some text in the translation source file.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        findWhat->setText(QApplication::translate("FindDialog", "&Find what:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        led->setWhatsThis(QApplication::translate("FindDialog", "Type in the text to search for.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        groupBox->setTitle(QApplication::translate("FindDialog", "Options", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        sourceText->setWhatsThis(QApplication::translate("FindDialog", "Source texts are searched when checked.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        sourceText->setText(QApplication::translate("FindDialog", "&Source texts", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        translations->setWhatsThis(QApplication::translate("FindDialog", "Translations are searched when checked.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        translations->setText(QApplication::translate("FindDialog", "&Translations", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        matchCase->setWhatsThis(QApplication::translate("FindDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        matchCase->setText(QApplication::translate("FindDialog", "&Match case", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        comments->setWhatsThis(QApplication::translate("FindDialog", "Comments and contexts are searched when checked.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        comments->setText(QApplication::translate("FindDialog", "&Comments", 0, QApplication::UnicodeUTF8));
+        ignoreAccelerators->setText(QApplication::translate("FindDialog", "Ignore &accelerators", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        findNxt->setWhatsThis(QApplication::translate("FindDialog", "Click here to find the next occurrence of the text you typed in.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        findNxt->setText(QApplication::translate("FindDialog", "Find Next", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        cancel->setWhatsThis(QApplication::translate("FindDialog", "Click here to close this window.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        cancel->setText(QApplication::translate("FindDialog", "Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(FindDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class FindDialog: public Ui_FindDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // FINDDIALOG_H
diff --git a/tests/auto/uic/baseline/form.ui b/tests/auto/uic/baseline/form.ui
new file mode 100644
index 0000000..e5be1d9
--- /dev/null
+++ b/tests/auto/uic/baseline/form.ui
@@ -0,0 +1,162 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>WorldTimeForm</class>
+ <widget class="QWidget" name="WorldTimeForm" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>World Time Clock</string>
+  </property>
+  <layout class="QHBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="WorldTimeClock" name="worldTimeClock" />
+   </item>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Current time:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTimeEdit" name="timeEdit" >
+         <property name="readOnly" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Set time zone:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="spinBox" >
+         <property name="maximum" >
+          <number>12</number>
+         </property>
+         <property name="minimum" >
+          <number>-12</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>WorldTimeClock</class>
+   <extends></extends>
+   <header>worldtimeclock.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>spinBox</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>worldTimeClock</receiver>
+   <slot>setTimeZone(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>339</x>
+     <y>166</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>230</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>worldTimeClock</sender>
+   <signal>updated(QTime)</signal>
+   <receiver>timeEdit</receiver>
+   <slot>setTime(QTime)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>141</x>
+     <y>59</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>291</x>
+     <y>133</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/form.ui.h b/tests/auto/uic/baseline/form.ui.h
new file mode 100644
index 0000000..2a79c26
--- /dev/null
+++ b/tests/auto/uic/baseline/form.ui.h
@@ -0,0 +1,144 @@
+/********************************************************************************
+** Form generated from reading ui file 'form.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef FORM_H
+#define FORM_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTimeEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "worldtimeclock.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_WorldTimeForm
+{
+public:
+    QHBoxLayout *hboxLayout;
+    WorldTimeClock *worldTimeClock;
+    QVBoxLayout *vboxLayout;
+    QSpacerItem *spacerItem;
+    QHBoxLayout *hboxLayout1;
+    QLabel *label;
+    QTimeEdit *timeEdit;
+    QHBoxLayout *hboxLayout2;
+    QLabel *label_2;
+    QSpinBox *spinBox;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QWidget *WorldTimeForm)
+    {
+        if (WorldTimeForm->objectName().isEmpty())
+            WorldTimeForm->setObjectName(QString::fromUtf8("WorldTimeForm"));
+        WorldTimeForm->resize(400, 300);
+        hboxLayout = new QHBoxLayout(WorldTimeForm);
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(9);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        worldTimeClock = new WorldTimeClock(WorldTimeForm);
+        worldTimeClock->setObjectName(QString::fromUtf8("worldTimeClock"));
+
+        hboxLayout->addWidget(worldTimeClock);
+
+        vboxLayout = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(1);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(spacerItem);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(1);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        label = new QLabel(WorldTimeForm);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        hboxLayout1->addWidget(label);
+
+        timeEdit = new QTimeEdit(WorldTimeForm);
+        timeEdit->setObjectName(QString::fromUtf8("timeEdit"));
+        timeEdit->setReadOnly(true);
+
+        hboxLayout1->addWidget(timeEdit);
+
+
+        vboxLayout->addLayout(hboxLayout1);
+
+        hboxLayout2 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout2->setSpacing(6);
+#endif
+        hboxLayout2->setMargin(1);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        label_2 = new QLabel(WorldTimeForm);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        hboxLayout2->addWidget(label_2);
+
+        spinBox = new QSpinBox(WorldTimeForm);
+        spinBox->setObjectName(QString::fromUtf8("spinBox"));
+        spinBox->setMaximum(12);
+        spinBox->setMinimum(-12);
+
+        hboxLayout2->addWidget(spinBox);
+
+
+        vboxLayout->addLayout(hboxLayout2);
+
+        spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(spacerItem1);
+
+
+        hboxLayout->addLayout(vboxLayout);
+
+
+        retranslateUi(WorldTimeForm);
+        QObject::connect(spinBox, SIGNAL(valueChanged(int)), worldTimeClock, SLOT(setTimeZone(int)));
+        QObject::connect(worldTimeClock, SIGNAL(updated(QTime)), timeEdit, SLOT(setTime(QTime)));
+
+        QMetaObject::connectSlotsByName(WorldTimeForm);
+    } // setupUi
+
+    void retranslateUi(QWidget *WorldTimeForm)
+    {
+        WorldTimeForm->setWindowTitle(QApplication::translate("WorldTimeForm", "World Time Clock", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("WorldTimeForm", "Current time:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("WorldTimeForm", "Set time zone:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(WorldTimeForm);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class WorldTimeForm: public Ui_WorldTimeForm {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // FORM_H
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui b/tests/auto/uic/baseline/formwindowsettings.ui
new file mode 100644
index 0000000..77eff67
--- /dev/null
+++ b/tests/auto/uic/baseline/formwindowsettings.ui
@@ -0,0 +1,310 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>FormWindowSettings</class>
+ <widget class="QDialog" name="FormWindowSettings" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>433</width>
+    <height>465</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form Settings</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="6" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2" >
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QGroupBox" name="layoutDefaultGroupBox" >
+       <property name="title" >
+        <string>Layout &amp;Default</string>
+       </property>
+       <property name="checkable" >
+        <bool>true</bool>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>8</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item row="1" column="0" >
+         <widget class="QLabel" name="label_2" >
+          <property name="text" >
+           <string>&amp;Spacing:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>defaultSpacingSpinBox</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>&amp;Margin:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>defaultMarginSpinBox</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QSpinBox" name="defaultSpacingSpinBox" />
+        </item>
+        <item row="0" column="1" >
+         <widget class="QSpinBox" name="defaultMarginSpinBox" />
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="layoutFunctionGroupBox" >
+       <property name="title" >
+        <string>&amp;Layout Function</string>
+       </property>
+       <property name="checkable" >
+        <bool>true</bool>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>8</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item row="1" column="1" >
+         <widget class="QLineEdit" name="spacingFunctionLineEdit" />
+        </item>
+        <item row="0" column="1" >
+         <widget class="QLineEdit" name="marginFunctionLineEdit" />
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="label_3" >
+          <property name="text" >
+           <string>Ma&amp;rgin:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>marginFunctionLineEdit</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QLabel" name="label_3_2" >
+          <property name="text" >
+           <string>Spa&amp;cing:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>spacingFunctionLineEdit</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="QGroupBox" name="pixmapFunctionGroupBox_2" >
+     <property name="title" >
+      <string>&amp;Author</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QLineEdit" name="authorLineEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item rowspan="2" row="3" column="0" >
+    <widget class="QGroupBox" name="includeHintsGroupBox" >
+     <property name="title" >
+      <string>&amp;Include Hints</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QTextEdit" name="includeHintsTextEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QGroupBox" name="pixmapFunctionGroupBox" >
+       <property name="title" >
+        <string>&amp;Pixmap Function</string>
+       </property>
+       <property name="checkable" >
+        <bool>true</bool>
+       </property>
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>8</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLineEdit" name="pixmapFunctionLineEdit" />
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="4" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>111</width>
+       <height>115</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="qdesigner_internal::GridPanel" name="gridPanel" >
+     <property name="title" >
+      <string>Grid</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qdesigner_internal::GridPanel</class>
+   <extends>QGroupBox</extends>
+   <header location="global" >gridpanel_p.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>authorLineEdit</tabstop>
+  <tabstop>defaultMarginSpinBox</tabstop>
+  <tabstop>defaultSpacingSpinBox</tabstop>
+  <tabstop>marginFunctionLineEdit</tabstop>
+  <tabstop>spacingFunctionLineEdit</tabstop>
+  <tabstop>pixmapFunctionLineEdit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>FormWindowSettings</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>294</x>
+     <y>442</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>150</x>
+     <y>459</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>FormWindowSettings</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>373</x>
+     <y>444</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>357</x>
+     <y>461</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/uic/baseline/formwindowsettings.ui.h
new file mode 100644
index 0000000..7f0baf6
--- /dev/null
+++ b/tests/auto/uic/baseline/formwindowsettings.ui.h
@@ -0,0 +1,312 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'formwindowsettings.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef FORMWINDOWSETTINGS_H
+#define FORMWINDOWSETTINGS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <gridpanel_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_FormWindowSettings
+{
+public:
+    QGridLayout *gridLayout;
+    QDialogButtonBox *buttonBox;
+    QFrame *line;
+    QHBoxLayout *hboxLayout;
+    QGroupBox *layoutDefaultGroupBox;
+    QGridLayout *gridLayout1;
+    QLabel *label_2;
+    QLabel *label;
+    QSpinBox *defaultSpacingSpinBox;
+    QSpinBox *defaultMarginSpinBox;
+    QGroupBox *layoutFunctionGroupBox;
+    QGridLayout *gridLayout2;
+    QLineEdit *spacingFunctionLineEdit;
+    QLineEdit *marginFunctionLineEdit;
+    QLabel *label_3;
+    QLabel *label_3_2;
+    QGroupBox *pixmapFunctionGroupBox_2;
+    QVBoxLayout *vboxLayout;
+    QLineEdit *authorLineEdit;
+    QGroupBox *includeHintsGroupBox;
+    QVBoxLayout *vboxLayout1;
+    QTextEdit *includeHintsTextEdit;
+    QHBoxLayout *hboxLayout1;
+    QGroupBox *pixmapFunctionGroupBox;
+    QVBoxLayout *vboxLayout2;
+    QLineEdit *pixmapFunctionLineEdit;
+    QSpacerItem *spacerItem;
+    qdesigner_internal::GridPanel *gridPanel;
+
+    void setupUi(QDialog *FormWindowSettings)
+    {
+        if (FormWindowSettings->objectName().isEmpty())
+            FormWindowSettings->setObjectName(QString::fromUtf8("FormWindowSettings"));
+        FormWindowSettings->resize(433, 465);
+        gridLayout = new QGridLayout(FormWindowSettings);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        buttonBox = new QDialogButtonBox(FormWindowSettings);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 6, 0, 1, 2);
+
+        line = new QFrame(FormWindowSettings);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        gridLayout->addWidget(line, 5, 0, 1, 2);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        layoutDefaultGroupBox = new QGroupBox(FormWindowSettings);
+        layoutDefaultGroupBox->setObjectName(QString::fromUtf8("layoutDefaultGroupBox"));
+        layoutDefaultGroupBox->setCheckable(true);
+        gridLayout1 = new QGridLayout(layoutDefaultGroupBox);
+#ifndef Q_OS_MAC
+        gridLayout1->setSpacing(6);
+#endif
+        gridLayout1->setMargin(8);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        label_2 = new QLabel(layoutDefaultGroupBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout1->addWidget(label_2, 1, 0, 1, 1);
+
+        label = new QLabel(layoutDefaultGroupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout1->addWidget(label, 0, 0, 1, 1);
+
+        defaultSpacingSpinBox = new QSpinBox(layoutDefaultGroupBox);
+        defaultSpacingSpinBox->setObjectName(QString::fromUtf8("defaultSpacingSpinBox"));
+
+        gridLayout1->addWidget(defaultSpacingSpinBox, 1, 1, 1, 1);
+
+        defaultMarginSpinBox = new QSpinBox(layoutDefaultGroupBox);
+        defaultMarginSpinBox->setObjectName(QString::fromUtf8("defaultMarginSpinBox"));
+
+        gridLayout1->addWidget(defaultMarginSpinBox, 0, 1, 1, 1);
+
+
+        hboxLayout->addWidget(layoutDefaultGroupBox);
+
+        layoutFunctionGroupBox = new QGroupBox(FormWindowSettings);
+        layoutFunctionGroupBox->setObjectName(QString::fromUtf8("layoutFunctionGroupBox"));
+        layoutFunctionGroupBox->setCheckable(true);
+        gridLayout2 = new QGridLayout(layoutFunctionGroupBox);
+#ifndef Q_OS_MAC
+        gridLayout2->setSpacing(6);
+#endif
+        gridLayout2->setMargin(8);
+        gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+        spacingFunctionLineEdit = new QLineEdit(layoutFunctionGroupBox);
+        spacingFunctionLineEdit->setObjectName(QString::fromUtf8("spacingFunctionLineEdit"));
+
+        gridLayout2->addWidget(spacingFunctionLineEdit, 1, 1, 1, 1);
+
+        marginFunctionLineEdit = new QLineEdit(layoutFunctionGroupBox);
+        marginFunctionLineEdit->setObjectName(QString::fromUtf8("marginFunctionLineEdit"));
+
+        gridLayout2->addWidget(marginFunctionLineEdit, 0, 1, 1, 1);
+
+        label_3 = new QLabel(layoutFunctionGroupBox);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout2->addWidget(label_3, 0, 0, 1, 1);
+
+        label_3_2 = new QLabel(layoutFunctionGroupBox);
+        label_3_2->setObjectName(QString::fromUtf8("label_3_2"));
+
+        gridLayout2->addWidget(label_3_2, 1, 0, 1, 1);
+
+
+        hboxLayout->addWidget(layoutFunctionGroupBox);
+
+
+        gridLayout->addLayout(hboxLayout, 2, 0, 1, 2);
+
+        pixmapFunctionGroupBox_2 = new QGroupBox(FormWindowSettings);
+        pixmapFunctionGroupBox_2->setObjectName(QString::fromUtf8("pixmapFunctionGroupBox_2"));
+        vboxLayout = new QVBoxLayout(pixmapFunctionGroupBox_2);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(8);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        authorLineEdit = new QLineEdit(pixmapFunctionGroupBox_2);
+        authorLineEdit->setObjectName(QString::fromUtf8("authorLineEdit"));
+
+        vboxLayout->addWidget(authorLineEdit);
+
+
+        gridLayout->addWidget(pixmapFunctionGroupBox_2, 0, 0, 1, 2);
+
+        includeHintsGroupBox = new QGroupBox(FormWindowSettings);
+        includeHintsGroupBox->setObjectName(QString::fromUtf8("includeHintsGroupBox"));
+        vboxLayout1 = new QVBoxLayout(includeHintsGroupBox);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+        vboxLayout1->setMargin(8);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        includeHintsTextEdit = new QTextEdit(includeHintsGroupBox);
+        includeHintsTextEdit->setObjectName(QString::fromUtf8("includeHintsTextEdit"));
+
+        vboxLayout1->addWidget(includeHintsTextEdit);
+
+
+        gridLayout->addWidget(includeHintsGroupBox, 3, 0, 2, 1);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        pixmapFunctionGroupBox = new QGroupBox(FormWindowSettings);
+        pixmapFunctionGroupBox->setObjectName(QString::fromUtf8("pixmapFunctionGroupBox"));
+        pixmapFunctionGroupBox->setCheckable(true);
+        vboxLayout2 = new QVBoxLayout(pixmapFunctionGroupBox);
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+        vboxLayout2->setMargin(8);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        pixmapFunctionLineEdit = new QLineEdit(pixmapFunctionGroupBox);
+        pixmapFunctionLineEdit->setObjectName(QString::fromUtf8("pixmapFunctionLineEdit"));
+
+        vboxLayout2->addWidget(pixmapFunctionLineEdit);
+
+
+        hboxLayout1->addWidget(pixmapFunctionGroupBox);
+
+
+        gridLayout->addLayout(hboxLayout1, 3, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(111, 115, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem, 4, 1, 1, 1);
+
+        gridPanel = new qdesigner_internal::GridPanel(FormWindowSettings);
+        gridPanel->setObjectName(QString::fromUtf8("gridPanel"));
+
+        gridLayout->addWidget(gridPanel, 1, 0, 1, 2);
+
+#ifndef QT_NO_SHORTCUT
+        label_2->setBuddy(defaultSpacingSpinBox);
+        label->setBuddy(defaultMarginSpinBox);
+        label_3->setBuddy(marginFunctionLineEdit);
+        label_3_2->setBuddy(spacingFunctionLineEdit);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(authorLineEdit, defaultMarginSpinBox);
+        QWidget::setTabOrder(defaultMarginSpinBox, defaultSpacingSpinBox);
+        QWidget::setTabOrder(defaultSpacingSpinBox, marginFunctionLineEdit);
+        QWidget::setTabOrder(marginFunctionLineEdit, spacingFunctionLineEdit);
+        QWidget::setTabOrder(spacingFunctionLineEdit, pixmapFunctionLineEdit);
+
+        retranslateUi(FormWindowSettings);
+        QObject::connect(buttonBox, SIGNAL(accepted()), FormWindowSettings, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), FormWindowSettings, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(FormWindowSettings);
+    } // setupUi
+
+    void retranslateUi(QDialog *FormWindowSettings)
+    {
+        FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", 0, QApplication::UnicodeUTF8));
+        layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("FormWindowSettings", "&Margin:", 0, QApplication::UnicodeUTF8));
+        layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", 0, QApplication::UnicodeUTF8));
+        label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", 0, QApplication::UnicodeUTF8));
+        pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", 0, QApplication::UnicodeUTF8));
+        includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", 0, QApplication::UnicodeUTF8));
+        pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", 0, QApplication::UnicodeUTF8));
+        gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(FormWindowSettings);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class FormWindowSettings: public Ui_FormWindowSettings {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // FORMWINDOWSETTINGS_H
diff --git a/tests/auto/uic/baseline/generalpage.ui b/tests/auto/uic/baseline/generalpage.ui
new file mode 100644
index 0000000..9c2babb
--- /dev/null
+++ b/tests/auto/uic/baseline/generalpage.ui
@@ -0,0 +1,69 @@
+<ui version="4.0" >
+ <class>GeneralPage</class>
+ <widget class="QWidget" name="GeneralPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>243</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Namespace:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="namespaceLineEdit" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Virtual Folder:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="folderLineEdit" />
+   </item>
+   <item row="0" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/generalpage.ui.h b/tests/auto/uic/baseline/generalpage.ui.h
new file mode 100644
index 0000000..0289f50
--- /dev/null
+++ b/tests/auto/uic/baseline/generalpage.ui.h
@@ -0,0 +1,94 @@
+/********************************************************************************
+** Form generated from reading ui file 'generalpage.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef GENERALPAGE_H
+#define GENERALPAGE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_GeneralPage
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QLineEdit *namespaceLineEdit;
+    QLabel *label_2;
+    QLineEdit *folderLineEdit;
+    QSpacerItem *spacerItem;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QWidget *GeneralPage)
+    {
+        if (GeneralPage->objectName().isEmpty())
+            GeneralPage->setObjectName(QString::fromUtf8("GeneralPage"));
+        GeneralPage->resize(417, 243);
+        gridLayout = new QGridLayout(GeneralPage);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(GeneralPage);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 1, 0, 1, 1);
+
+        namespaceLineEdit = new QLineEdit(GeneralPage);
+        namespaceLineEdit->setObjectName(QString::fromUtf8("namespaceLineEdit"));
+
+        gridLayout->addWidget(namespaceLineEdit, 1, 1, 1, 1);
+
+        label_2 = new QLabel(GeneralPage);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout->addWidget(label_2, 2, 0, 1, 1);
+
+        folderLineEdit = new QLineEdit(GeneralPage);
+        folderLineEdit->setObjectName(QString::fromUtf8("folderLineEdit"));
+
+        gridLayout->addWidget(folderLineEdit, 2, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem, 0, 1, 1, 1);
+
+        spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem1, 3, 1, 1, 1);
+
+
+        retranslateUi(GeneralPage);
+
+        QMetaObject::connectSlotsByName(GeneralPage);
+    } // setupUi
+
+    void retranslateUi(QWidget *GeneralPage)
+    {
+        GeneralPage->setWindowTitle(QApplication::translate("GeneralPage", "Form", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("GeneralPage", "Namespace:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("GeneralPage", "Virtual Folder:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(GeneralPage);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class GeneralPage: public Ui_GeneralPage {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // GENERALPAGE_H
diff --git a/tests/auto/uic/baseline/gridpanel.ui b/tests/auto/uic/baseline/gridpanel.ui
new file mode 100644
index 0000000..adfdd36
--- /dev/null
+++ b/tests/auto/uic/baseline/gridpanel.ui
@@ -0,0 +1,144 @@
+<ui version="4.0" >
+ <class>qdesigner_internal::GridPanel</class>
+ <widget class="QWidget" name="qdesigner_internal::GridPanel" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>393</width>
+    <height>110</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="m_gridGroupBox" >
+     <property name="title" >
+      <string>Grid</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="m_visibleCheckBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>Visible</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Grid &amp;X</string>
+        </property>
+        <property name="buddy" >
+         <cstring>m_deltaXSpinBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QSpinBox" name="m_deltaXSpinBox" >
+        <property name="minimum" >
+         <number>2</number>
+        </property>
+        <property name="maximum" >
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QCheckBox" name="m_snapXCheckBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>Snap</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QPushButton" name="m_resetButton" >
+          <property name="text" >
+           <string>Reset</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>20</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Grid &amp;Y</string>
+        </property>
+        <property name="buddy" >
+         <cstring>m_deltaYSpinBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QSpinBox" name="m_deltaYSpinBox" >
+        <property name="minimum" >
+         <number>2</number>
+        </property>
+        <property name="maximum" >
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3" >
+       <widget class="QCheckBox" name="m_snapYCheckBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>Snap</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/gridpanel.ui.h b/tests/auto/uic/baseline/gridpanel.ui.h
new file mode 100644
index 0000000..f79ffa9
--- /dev/null
+++ b/tests/auto/uic/baseline/gridpanel.ui.h
@@ -0,0 +1,162 @@
+/********************************************************************************
+** Form generated from reading ui file 'gridpanel.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef GRIDPANEL_H
+#define GRIDPANEL_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_GridPanel
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *m_gridGroupBox;
+    QGridLayout *gridLayout;
+    QCheckBox *m_visibleCheckBox;
+    QLabel *label;
+    QSpinBox *m_deltaXSpinBox;
+    QCheckBox *m_snapXCheckBox;
+    QHBoxLayout *hboxLayout;
+    QPushButton *m_resetButton;
+    QSpacerItem *spacerItem;
+    QLabel *label_2;
+    QSpinBox *m_deltaYSpinBox;
+    QCheckBox *m_snapYCheckBox;
+
+    void setupUi(QWidget *qdesigner_internal__GridPanel)
+    {
+        if (qdesigner_internal__GridPanel->objectName().isEmpty())
+            qdesigner_internal__GridPanel->setObjectName(QString::fromUtf8("qdesigner_internal__GridPanel"));
+        qdesigner_internal__GridPanel->resize(393, 110);
+        vboxLayout = new QVBoxLayout(qdesigner_internal__GridPanel);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
+        m_gridGroupBox = new QGroupBox(qdesigner_internal__GridPanel);
+        m_gridGroupBox->setObjectName(QString::fromUtf8("m_gridGroupBox"));
+        gridLayout = new QGridLayout(m_gridGroupBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        m_visibleCheckBox = new QCheckBox(m_gridGroupBox);
+        m_visibleCheckBox->setObjectName(QString::fromUtf8("m_visibleCheckBox"));
+        QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(m_visibleCheckBox->sizePolicy().hasHeightForWidth());
+        m_visibleCheckBox->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(m_visibleCheckBox, 0, 0, 1, 1);
+
+        label = new QLabel(m_gridGroupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 1, 1, 1);
+
+        m_deltaXSpinBox = new QSpinBox(m_gridGroupBox);
+        m_deltaXSpinBox->setObjectName(QString::fromUtf8("m_deltaXSpinBox"));
+        m_deltaXSpinBox->setMinimum(2);
+        m_deltaXSpinBox->setMaximum(100);
+
+        gridLayout->addWidget(m_deltaXSpinBox, 0, 2, 1, 1);
+
+        m_snapXCheckBox = new QCheckBox(m_gridGroupBox);
+        m_snapXCheckBox->setObjectName(QString::fromUtf8("m_snapXCheckBox"));
+        sizePolicy.setHeightForWidth(m_snapXCheckBox->sizePolicy().hasHeightForWidth());
+        m_snapXCheckBox->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(m_snapXCheckBox, 0, 3, 1, 1);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        m_resetButton = new QPushButton(m_gridGroupBox);
+        m_resetButton->setObjectName(QString::fromUtf8("m_resetButton"));
+
+        hboxLayout->addWidget(m_resetButton);
+
+        spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        gridLayout->addLayout(hboxLayout, 1, 0, 1, 1);
+
+        label_2 = new QLabel(m_gridGroupBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout->addWidget(label_2, 1, 1, 1, 1);
+
+        m_deltaYSpinBox = new QSpinBox(m_gridGroupBox);
+        m_deltaYSpinBox->setObjectName(QString::fromUtf8("m_deltaYSpinBox"));
+        m_deltaYSpinBox->setMinimum(2);
+        m_deltaYSpinBox->setMaximum(100);
+
+        gridLayout->addWidget(m_deltaYSpinBox, 1, 2, 1, 1);
+
+        m_snapYCheckBox = new QCheckBox(m_gridGroupBox);
+        m_snapYCheckBox->setObjectName(QString::fromUtf8("m_snapYCheckBox"));
+        sizePolicy.setHeightForWidth(m_snapYCheckBox->sizePolicy().hasHeightForWidth());
+        m_snapYCheckBox->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(m_snapYCheckBox, 1, 3, 1, 1);
+
+
+        vboxLayout->addWidget(m_gridGroupBox);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(m_deltaXSpinBox);
+        label_2->setBuddy(m_deltaYSpinBox);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(qdesigner_internal__GridPanel);
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__GridPanel);
+    } // setupUi
+
+    void retranslateUi(QWidget *qdesigner_internal__GridPanel)
+    {
+        qdesigner_internal__GridPanel->setWindowTitle(QApplication::translate("qdesigner_internal::GridPanel", "Form", 0, QApplication::UnicodeUTF8));
+        m_gridGroupBox->setTitle(QApplication::translate("qdesigner_internal::GridPanel", "Grid", 0, QApplication::UnicodeUTF8));
+        m_visibleCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Visible", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &X", 0, QApplication::UnicodeUTF8));
+        m_snapXCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", 0, QApplication::UnicodeUTF8));
+        m_resetButton->setText(QApplication::translate("qdesigner_internal::GridPanel", "Reset", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &Y", 0, QApplication::UnicodeUTF8));
+        m_snapYCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__GridPanel);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class GridPanel: public Ui_GridPanel {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // GRIDPANEL_H
diff --git a/tests/auto/uic/baseline/helpdialog.ui b/tests/auto/uic/baseline/helpdialog.ui
new file mode 100644
index 0000000..fe6ee9d
--- /dev/null
+++ b/tests/auto/uic/baseline/helpdialog.ui
@@ -0,0 +1,403 @@
+<ui version="4.0" >
+ <author></author>
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Assistant of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <exportmacro></exportmacro>
+ <class>HelpDialog</class>
+ <widget class="QWidget" name="HelpDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>274</width>
+    <height>417</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Help</string>
+  </property>
+  <property name="whatsThis" >
+   <string>&lt;b>Help&lt;/b>&lt;p>Choose the topic you want help on from the contents list, or search the index for keywords.&lt;/p></string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="whatsThis" >
+      <string>Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search.</string>
+     </property>
+     <widget class="QWidget" name="contentPage" >
+      <attribute name="title" >
+       <string>Con&amp;tents</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>5</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QTreeWidget" name="listContents" >
+         <property name="contextMenuPolicy" >
+          <enum>Qt::CustomContextMenu</enum>
+         </property>
+         <property name="whatsThis" >
+          <string>&lt;b>Help topics organized by category.&lt;/b>&lt;p>Double-click an item to see the topics in that category. To view a topic, just double-click it.&lt;/p></string>
+         </property>
+         <property name="rootIsDecorated" >
+          <bool>true</bool>
+         </property>
+         <property name="uniformRowHeights" >
+          <bool>true</bool>
+         </property>
+         <column>
+          <property name="text" >
+           <string>column 1</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="indexPage" >
+      <attribute name="title" >
+       <string>&amp;Index</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>5</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="TextLabel1" >
+         <property name="text" >
+          <string>&amp;Look For:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>editIndex</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="editIndex" >
+         <property name="toolTip" >
+          <string>Enter keyword</string>
+         </property>
+         <property name="whatsThis" >
+          <string>&lt;b>Enter a keyword.&lt;/b>&lt;p>The list will select an item that matches the entered string best.&lt;/p></string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QListView" name="listIndex" >
+         <property name="contextMenuPolicy" >
+          <enum>Qt::CustomContextMenu</enum>
+         </property>
+         <property name="whatsThis" >
+          <string>&lt;b>List of available help topics.&lt;/b>&lt;p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.&lt;/p></string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="bookmarkPage" >
+      <attribute name="title" >
+       <string>&amp;Bookmarks</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>5</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QTreeWidget" name="listBookmarks" >
+         <property name="contextMenuPolicy" >
+          <enum>Qt::CustomContextMenu</enum>
+         </property>
+         <property name="whatsThis" >
+          <string>Displays the list of bookmarks.</string>
+         </property>
+         <property name="uniformRowHeights" >
+          <bool>true</bool>
+         </property>
+         <column>
+          <property name="text" >
+           <string>column 1</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType" >
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="buttonAdd" >
+           <property name="toolTip" >
+            <string>Add new bookmark</string>
+           </property>
+           <property name="whatsThis" >
+            <string>Add the currently displayed page as a new bookmark.</string>
+           </property>
+           <property name="text" >
+            <string>&amp;New</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="buttonRemove" >
+           <property name="toolTip" >
+            <string>Delete bookmark</string>
+           </property>
+           <property name="whatsThis" >
+            <string>Delete the selected bookmark.</string>
+           </property>
+           <property name="text" >
+            <string>&amp;Delete</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="searchPage" >
+      <attribute name="title" >
+       <string>&amp;Search</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>5</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item row="3" column="0" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="TextLabel1_2" >
+         <property name="text" >
+          <string>Searching f&amp;or:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>termsEdit</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLineEdit" name="termsEdit" >
+         <property name="toolTip" >
+          <string>Enter searchword(s).</string>
+         </property>
+         <property name="whatsThis" >
+          <string>&lt;b>Enter search word(s).&lt;/b>&lt;p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.&lt;/p></string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" >
+        <widget class="QListWidget" name="resultBox" >
+         <property name="contextMenuPolicy" >
+          <enum>Qt::CustomContextMenu</enum>
+         </property>
+         <property name="whatsThis" >
+          <string>&lt;b>Found documents&lt;/b>&lt;p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.&lt;/p></string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" >
+        <widget class="QLabel" name="TextLabel2" >
+         <property name="text" >
+          <string>Found &amp;Documents:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>resultBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>1</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QPushButton" name="helpButton" >
+           <property name="toolTip" >
+            <string>Display the help page.</string>
+           </property>
+           <property name="whatsThis" >
+            <string>Display the help page for the full text search.</string>
+           </property>
+           <property name="text" >
+            <string>He&amp;lp</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType" >
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>61</width>
+             <height>21</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="searchButton" >
+           <property name="toolTip" >
+            <string>Start searching.</string>
+           </property>
+           <property name="whatsThis" >
+            <string>Pressing this button starts the search.</string>
+           </property>
+           <property name="text" >
+            <string>&amp;Search</string>
+           </property>
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="framePrepare" >
+     <property name="frameShape" >
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>3</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="labelPrepare" >
+        <property name="text" >
+         <string>Preparing...</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QProgressBar" name="progressPrepare" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>listContents</tabstop>
+  <tabstop>editIndex</tabstop>
+  <tabstop>listIndex</tabstop>
+  <tabstop>listBookmarks</tabstop>
+  <tabstop>buttonAdd</tabstop>
+  <tabstop>buttonRemove</tabstop>
+  <tabstop>termsEdit</tabstop>
+  <tabstop>searchButton</tabstop>
+  <tabstop>helpButton</tabstop>
+  <tabstop>resultBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h
new file mode 100644
index 0000000..e0d38b3
--- /dev/null
+++ b/tests/auto/uic/baseline/helpdialog.ui.h
@@ -0,0 +1,396 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Assistant of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'helpdialog.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef HELPDIALOG_H
+#define HELPDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListView>
+#include <QtGui/QListWidget>
+#include <QtGui/QProgressBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTabWidget>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_HelpDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QTabWidget *tabWidget;
+    QWidget *contentPage;
+    QVBoxLayout *vboxLayout1;
+    QTreeWidget *listContents;
+    QWidget *indexPage;
+    QVBoxLayout *vboxLayout2;
+    QLabel *TextLabel1;
+    QLineEdit *editIndex;
+    QListView *listIndex;
+    QWidget *bookmarkPage;
+    QVBoxLayout *vboxLayout3;
+    QTreeWidget *listBookmarks;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacerItem;
+    QPushButton *buttonAdd;
+    QPushButton *buttonRemove;
+    QWidget *searchPage;
+    QGridLayout *gridLayout;
+    QSpacerItem *spacerItem1;
+    QLabel *TextLabel1_2;
+    QLineEdit *termsEdit;
+    QListWidget *resultBox;
+    QLabel *TextLabel2;
+    QHBoxLayout *hboxLayout1;
+    QPushButton *helpButton;
+    QSpacerItem *spacerItem2;
+    QPushButton *searchButton;
+    QFrame *framePrepare;
+    QHBoxLayout *hboxLayout2;
+    QLabel *labelPrepare;
+    QProgressBar *progressPrepare;
+
+    void setupUi(QWidget *HelpDialog)
+    {
+        if (HelpDialog->objectName().isEmpty())
+            HelpDialog->setObjectName(QString::fromUtf8("HelpDialog"));
+        HelpDialog->resize(274, 417);
+        vboxLayout = new QVBoxLayout(HelpDialog);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(0);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        tabWidget = new QTabWidget(HelpDialog);
+        tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
+        contentPage = new QWidget();
+        contentPage->setObjectName(QString::fromUtf8("contentPage"));
+        vboxLayout1 = new QVBoxLayout(contentPage);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+        vboxLayout1->setMargin(5);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        listContents = new QTreeWidget(contentPage);
+        listContents->setObjectName(QString::fromUtf8("listContents"));
+        listContents->setContextMenuPolicy(Qt::CustomContextMenu);
+        listContents->setRootIsDecorated(true);
+        listContents->setUniformRowHeights(true);
+
+        vboxLayout1->addWidget(listContents);
+
+        tabWidget->addTab(contentPage, QString());
+        indexPage = new QWidget();
+        indexPage->setObjectName(QString::fromUtf8("indexPage"));
+        vboxLayout2 = new QVBoxLayout(indexPage);
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+        vboxLayout2->setMargin(5);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        TextLabel1 = new QLabel(indexPage);
+        TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+
+        vboxLayout2->addWidget(TextLabel1);
+
+        editIndex = new QLineEdit(indexPage);
+        editIndex->setObjectName(QString::fromUtf8("editIndex"));
+
+        vboxLayout2->addWidget(editIndex);
+
+        listIndex = new QListView(indexPage);
+        listIndex->setObjectName(QString::fromUtf8("listIndex"));
+        listIndex->setContextMenuPolicy(Qt::CustomContextMenu);
+
+        vboxLayout2->addWidget(listIndex);
+
+        tabWidget->addTab(indexPage, QString());
+        bookmarkPage = new QWidget();
+        bookmarkPage->setObjectName(QString::fromUtf8("bookmarkPage"));
+        vboxLayout3 = new QVBoxLayout(bookmarkPage);
+#ifndef Q_OS_MAC
+        vboxLayout3->setSpacing(6);
+#endif
+        vboxLayout3->setMargin(5);
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        listBookmarks = new QTreeWidget(bookmarkPage);
+        listBookmarks->setObjectName(QString::fromUtf8("listBookmarks"));
+        listBookmarks->setContextMenuPolicy(Qt::CustomContextMenu);
+        listBookmarks->setUniformRowHeights(true);
+
+        vboxLayout3->addWidget(listBookmarks);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+        buttonAdd = new QPushButton(bookmarkPage);
+        buttonAdd->setObjectName(QString::fromUtf8("buttonAdd"));
+
+        hboxLayout->addWidget(buttonAdd);
+
+        buttonRemove = new QPushButton(bookmarkPage);
+        buttonRemove->setObjectName(QString::fromUtf8("buttonRemove"));
+
+        hboxLayout->addWidget(buttonRemove);
+
+
+        vboxLayout3->addLayout(hboxLayout);
+
+        tabWidget->addTab(bookmarkPage, QString());
+        searchPage = new QWidget();
+        searchPage->setObjectName(QString::fromUtf8("searchPage"));
+        gridLayout = new QGridLayout(searchPage);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+        gridLayout->setMargin(5);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem1, 3, 0, 1, 1);
+
+        TextLabel1_2 = new QLabel(searchPage);
+        TextLabel1_2->setObjectName(QString::fromUtf8("TextLabel1_2"));
+
+        gridLayout->addWidget(TextLabel1_2, 0, 0, 1, 1);
+
+        termsEdit = new QLineEdit(searchPage);
+        termsEdit->setObjectName(QString::fromUtf8("termsEdit"));
+
+        gridLayout->addWidget(termsEdit, 1, 0, 1, 1);
+
+        resultBox = new QListWidget(searchPage);
+        resultBox->setObjectName(QString::fromUtf8("resultBox"));
+        resultBox->setContextMenuPolicy(Qt::CustomContextMenu);
+
+        gridLayout->addWidget(resultBox, 5, 0, 1, 1);
+
+        TextLabel2 = new QLabel(searchPage);
+        TextLabel2->setObjectName(QString::fromUtf8("TextLabel2"));
+
+        gridLayout->addWidget(TextLabel2, 4, 0, 1, 1);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(1);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        helpButton = new QPushButton(searchPage);
+        helpButton->setObjectName(QString::fromUtf8("helpButton"));
+
+        hboxLayout1->addWidget(helpButton);
+
+        spacerItem2 = new QSpacerItem(61, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem2);
+
+        searchButton = new QPushButton(searchPage);
+        searchButton->setObjectName(QString::fromUtf8("searchButton"));
+        searchButton->setEnabled(false);
+
+        hboxLayout1->addWidget(searchButton);
+
+
+        gridLayout->addLayout(hboxLayout1, 2, 0, 1, 1);
+
+        tabWidget->addTab(searchPage, QString());
+
+        vboxLayout->addWidget(tabWidget);
+
+        framePrepare = new QFrame(HelpDialog);
+        framePrepare->setObjectName(QString::fromUtf8("framePrepare"));
+        framePrepare->setFrameShape(QFrame::StyledPanel);
+        framePrepare->setFrameShadow(QFrame::Raised);
+        hboxLayout2 = new QHBoxLayout(framePrepare);
+#ifndef Q_OS_MAC
+        hboxLayout2->setSpacing(6);
+#endif
+        hboxLayout2->setMargin(3);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        labelPrepare = new QLabel(framePrepare);
+        labelPrepare->setObjectName(QString::fromUtf8("labelPrepare"));
+
+        hboxLayout2->addWidget(labelPrepare);
+
+        progressPrepare = new QProgressBar(framePrepare);
+        progressPrepare->setObjectName(QString::fromUtf8("progressPrepare"));
+
+        hboxLayout2->addWidget(progressPrepare);
+
+
+        vboxLayout->addWidget(framePrepare);
+
+#ifndef QT_NO_SHORTCUT
+        TextLabel1->setBuddy(editIndex);
+        TextLabel1_2->setBuddy(termsEdit);
+        TextLabel2->setBuddy(resultBox);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(tabWidget, listContents);
+        QWidget::setTabOrder(listContents, editIndex);
+        QWidget::setTabOrder(editIndex, listIndex);
+        QWidget::setTabOrder(listIndex, listBookmarks);
+        QWidget::setTabOrder(listBookmarks, buttonAdd);
+        QWidget::setTabOrder(buttonAdd, buttonRemove);
+        QWidget::setTabOrder(buttonRemove, termsEdit);
+        QWidget::setTabOrder(termsEdit, searchButton);
+        QWidget::setTabOrder(searchButton, helpButton);
+        QWidget::setTabOrder(helpButton, resultBox);
+
+        retranslateUi(HelpDialog);
+
+        QMetaObject::connectSlotsByName(HelpDialog);
+    } // setupUi
+
+    void retranslateUi(QWidget *HelpDialog)
+    {
+        HelpDialog->setWindowTitle(QApplication::translate("HelpDialog", "Help", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        HelpDialog->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+#ifndef QT_NO_WHATSTHIS
+        tabWidget->setWhatsThis(QApplication::translate("HelpDialog", "Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        QTreeWidgetItem *___qtreewidgetitem = listContents->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("HelpDialog", "column 1", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        listContents->setWhatsThis(QApplication::translate("HelpDialog", "<b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        tabWidget->setTabText(tabWidget->indexOf(contentPage), QApplication::translate("HelpDialog", "Con&tents", 0, QApplication::UnicodeUTF8));
+        TextLabel1->setText(QApplication::translate("HelpDialog", "&Look For:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        editIndex->setToolTip(QApplication::translate("HelpDialog", "Enter keyword", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        editIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+#ifndef QT_NO_WHATSTHIS
+        listIndex->setWhatsThis(QApplication::translate("HelpDialog", "<b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        tabWidget->setTabText(tabWidget->indexOf(indexPage), QApplication::translate("HelpDialog", "&Index", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem1 = listBookmarks->headerItem();
+        ___qtreewidgetitem1->setText(0, QApplication::translate("HelpDialog", "column 1", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        listBookmarks->setWhatsThis(QApplication::translate("HelpDialog", "Displays the list of bookmarks.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+#ifndef QT_NO_TOOLTIP
+        buttonAdd->setToolTip(QApplication::translate("HelpDialog", "Add new bookmark", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        buttonAdd->setWhatsThis(QApplication::translate("HelpDialog", "Add the currently displayed page as a new bookmark.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        buttonAdd->setText(QApplication::translate("HelpDialog", "&New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        buttonRemove->setToolTip(QApplication::translate("HelpDialog", "Delete bookmark", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        buttonRemove->setWhatsThis(QApplication::translate("HelpDialog", "Delete the selected bookmark.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        buttonRemove->setText(QApplication::translate("HelpDialog", "&Delete", 0, QApplication::UnicodeUTF8));
+        tabWidget->setTabText(tabWidget->indexOf(bookmarkPage), QApplication::translate("HelpDialog", "&Bookmarks", 0, QApplication::UnicodeUTF8));
+        TextLabel1_2->setText(QApplication::translate("HelpDialog", "Searching f&or:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        termsEdit->setToolTip(QApplication::translate("HelpDialog", "Enter searchword(s).", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        termsEdit->setWhatsThis(QApplication::translate("HelpDialog", "<b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+#ifndef QT_NO_WHATSTHIS
+        resultBox->setWhatsThis(QApplication::translate("HelpDialog", "<b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        TextLabel2->setText(QApplication::translate("HelpDialog", "Found &Documents:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        helpButton->setToolTip(QApplication::translate("HelpDialog", "Display the help page.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        helpButton->setWhatsThis(QApplication::translate("HelpDialog", "Display the help page for the full text search.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        helpButton->setText(QApplication::translate("HelpDialog", "He&lp", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        searchButton->setToolTip(QApplication::translate("HelpDialog", "Start searching.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        searchButton->setWhatsThis(QApplication::translate("HelpDialog", "Pressing this button starts the search.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        searchButton->setText(QApplication::translate("HelpDialog", "&Search", 0, QApplication::UnicodeUTF8));
+        tabWidget->setTabText(tabWidget->indexOf(searchPage), QApplication::translate("HelpDialog", "&Search", 0, QApplication::UnicodeUTF8));
+        labelPrepare->setText(QApplication::translate("HelpDialog", "Preparing...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(HelpDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class HelpDialog: public Ui_HelpDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // HELPDIALOG_H
diff --git a/tests/auto/uic/baseline/history.ui b/tests/auto/uic/baseline/history.ui
new file mode 100644
index 0000000..0944940
--- /dev/null
+++ b/tests/auto/uic/baseline/history.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>HistoryDialog</class>
+ <widget class="QDialog" name="HistoryDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>758</width>
+    <height>450</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>History</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTreeView" name="tree" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeAllButton" >
+       <property name="text" >
+        <string>Remove &amp;All</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTreeView</class>
+   <extends>QTreeView</extends>
+   <header>edittreeview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>HistoryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/history.ui.h b/tests/auto/uic/baseline/history.ui.h
new file mode 100644
index 0000000..4b84e68
--- /dev/null
+++ b/tests/auto/uic/baseline/history.ui.h
@@ -0,0 +1,111 @@
+/********************************************************************************
+** Form generated from reading ui file 'history.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef HISTORY_H
+#define HISTORY_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include "edittreeview.h"
+#include "searchlineedit.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_HistoryDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QSpacerItem *spacerItem;
+    SearchLineEdit *search;
+    EditTreeView *tree;
+    QHBoxLayout *hboxLayout;
+    QPushButton *removeButton;
+    QPushButton *removeAllButton;
+    QSpacerItem *spacerItem1;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *HistoryDialog)
+    {
+        if (HistoryDialog->objectName().isEmpty())
+            HistoryDialog->setObjectName(QString::fromUtf8("HistoryDialog"));
+        HistoryDialog->resize(758, 450);
+        gridLayout = new QGridLayout(HistoryDialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        spacerItem = new QSpacerItem(252, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 0, 0, 1, 1);
+
+        search = new SearchLineEdit(HistoryDialog);
+        search->setObjectName(QString::fromUtf8("search"));
+
+        gridLayout->addWidget(search, 0, 1, 1, 1);
+
+        tree = new EditTreeView(HistoryDialog);
+        tree->setObjectName(QString::fromUtf8("tree"));
+
+        gridLayout->addWidget(tree, 1, 0, 1, 2);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        removeButton = new QPushButton(HistoryDialog);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+
+        hboxLayout->addWidget(removeButton);
+
+        removeAllButton = new QPushButton(HistoryDialog);
+        removeAllButton->setObjectName(QString::fromUtf8("removeAllButton"));
+
+        hboxLayout->addWidget(removeAllButton);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem1);
+
+        buttonBox = new QDialogButtonBox(HistoryDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setStandardButtons(QDialogButtonBox::Ok);
+
+        hboxLayout->addWidget(buttonBox);
+
+
+        gridLayout->addLayout(hboxLayout, 2, 0, 1, 2);
+
+
+        retranslateUi(HistoryDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), HistoryDialog, SLOT(accept()));
+
+        QMetaObject::connectSlotsByName(HistoryDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *HistoryDialog)
+    {
+        HistoryDialog->setWindowTitle(QApplication::translate("HistoryDialog", "History", 0, QApplication::UnicodeUTF8));
+        removeButton->setText(QApplication::translate("HistoryDialog", "&Remove", 0, QApplication::UnicodeUTF8));
+        removeAllButton->setText(QApplication::translate("HistoryDialog", "Remove &All", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(HistoryDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class HistoryDialog: public Ui_HistoryDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // HISTORY_H
diff --git a/tests/auto/uic/baseline/identifierpage.ui b/tests/auto/uic/baseline/identifierpage.ui
new file mode 100644
index 0000000..cd0df75
--- /dev/null
+++ b/tests/auto/uic/baseline/identifierpage.ui
@@ -0,0 +1,132 @@
+<ui version="4.0" >
+ <class>IdentifierPage</class>
+ <widget class="QWidget" name="IdentifierPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>242</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="QCheckBox" name="identifierCheckBox" >
+     <property name="text" >
+      <string>Create identifiers</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>161</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>30</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QRadioButton" name="globalButton" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="text" >
+      <string>Global prefix:</string>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QLineEdit" name="prefixLineEdit" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2" >
+    <widget class="QRadioButton" name="fileNameButton" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="text" >
+      <string>Inherit prefix from file names</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>globalButton</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>prefixLineEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>122</x>
+     <y>72</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>161</x>
+     <y>71</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/identifierpage.ui.h b/tests/auto/uic/baseline/identifierpage.ui.h
new file mode 100644
index 0000000..7839600
--- /dev/null
+++ b/tests/auto/uic/baseline/identifierpage.ui.h
@@ -0,0 +1,111 @@
+/********************************************************************************
+** Form generated from reading ui file 'identifierpage.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef IDENTIFIERPAGE_H
+#define IDENTIFIERPAGE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLineEdit>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_IdentifierPage
+{
+public:
+    QGridLayout *gridLayout;
+    QSpacerItem *spacerItem;
+    QCheckBox *identifierCheckBox;
+    QSpacerItem *spacerItem1;
+    QSpacerItem *spacerItem2;
+    QRadioButton *globalButton;
+    QLineEdit *prefixLineEdit;
+    QRadioButton *fileNameButton;
+    QSpacerItem *spacerItem3;
+
+    void setupUi(QWidget *IdentifierPage)
+    {
+        if (IdentifierPage->objectName().isEmpty())
+            IdentifierPage->setObjectName(QString::fromUtf8("IdentifierPage"));
+        IdentifierPage->resize(417, 242);
+        gridLayout = new QGridLayout(IdentifierPage);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem, 0, 1, 1, 1);
+
+        identifierCheckBox = new QCheckBox(IdentifierPage);
+        identifierCheckBox->setObjectName(QString::fromUtf8("identifierCheckBox"));
+
+        gridLayout->addWidget(identifierCheckBox, 1, 0, 1, 3);
+
+        spacerItem1 = new QSpacerItem(161, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem1, 1, 3, 1, 1);
+
+        spacerItem2 = new QSpacerItem(30, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem2, 2, 0, 1, 1);
+
+        globalButton = new QRadioButton(IdentifierPage);
+        globalButton->setObjectName(QString::fromUtf8("globalButton"));
+        globalButton->setEnabled(false);
+        globalButton->setChecked(true);
+
+        gridLayout->addWidget(globalButton, 2, 1, 1, 1);
+
+        prefixLineEdit = new QLineEdit(IdentifierPage);
+        prefixLineEdit->setObjectName(QString::fromUtf8("prefixLineEdit"));
+        prefixLineEdit->setEnabled(false);
+
+        gridLayout->addWidget(prefixLineEdit, 2, 2, 1, 1);
+
+        fileNameButton = new QRadioButton(IdentifierPage);
+        fileNameButton->setObjectName(QString::fromUtf8("fileNameButton"));
+        fileNameButton->setEnabled(false);
+
+        gridLayout->addWidget(fileNameButton, 3, 1, 1, 2);
+
+        spacerItem3 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem3, 4, 1, 1, 1);
+
+
+        retranslateUi(IdentifierPage);
+        QObject::connect(globalButton, SIGNAL(toggled(bool)), prefixLineEdit, SLOT(setEnabled(bool)));
+
+        QMetaObject::connectSlotsByName(IdentifierPage);
+    } // setupUi
+
+    void retranslateUi(QWidget *IdentifierPage)
+    {
+        IdentifierPage->setWindowTitle(QApplication::translate("IdentifierPage", "Form", 0, QApplication::UnicodeUTF8));
+        identifierCheckBox->setText(QApplication::translate("IdentifierPage", "Create identifiers", 0, QApplication::UnicodeUTF8));
+        globalButton->setText(QApplication::translate("IdentifierPage", "Global prefix:", 0, QApplication::UnicodeUTF8));
+        fileNameButton->setText(QApplication::translate("IdentifierPage", "Inherit prefix from file names", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(IdentifierPage);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class IdentifierPage: public Ui_IdentifierPage {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // IDENTIFIERPAGE_H
diff --git a/tests/auto/uic/baseline/imagedialog.ui b/tests/auto/uic/baseline/imagedialog.ui
new file mode 100644
index 0000000..1c5e546
--- /dev/null
+++ b/tests/auto/uic/baseline/imagedialog.ui
@@ -0,0 +1,389 @@
+<ui version="4.0" >
+ <comment></comment>
+ <class>ImageDialog</class>
+ <widget class="QDialog" >
+  <property name="objectName" >
+   <string notr="true" >ImageDialog</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>320</width>
+    <height>180</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Create Image</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="widthLabel" >
+       <property name="objectName" >
+        <string notr="true" >widthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>27</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Width:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="heightLabel" >
+       <property name="objectName" >
+        <string notr="true" >heightLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>55</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Height:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QComboBox" name="colorDepthCombo" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthCombo</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="insertPolicy" >
+        <enum>QComboBox::InsertAtBottom</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="nameLineEdit" >
+       <property name="objectName" >
+        <string notr="true" >nameLineEdit</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Untitled image</string>
+       </property>
+       <property name="echoMode" >
+        <enum>QLineEdit::Normal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="spinBox" >
+       <property name="objectName" >
+        <string notr="true" >spinBox</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>1</y>
+         <width>227</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QSpinBox" name="spinBox_2" >
+       <property name="objectName" >
+        <string notr="true" >spinBox_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>27</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="nameLabel" >
+       <property name="objectName" >
+        <string notr="true" >nameLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>67</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Name:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="colorDepthLabel" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>83</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Color depth:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>9</x>
+       <y>121</y>
+       <width>302</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>128</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="objectName" >
+        <string notr="true" >okButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>135</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="objectName" >
+        <string notr="true" >cancelButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>221</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>nameLineEdit</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>spinBox_2</tabstop>
+  <tabstop>colorDepthCombo</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <connections>
+  <connection>
+   <sender>nameLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>okButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/imagedialog.ui.h b/tests/auto/uic/baseline/imagedialog.ui.h
new file mode 100644
index 0000000..fedc757
--- /dev/null
+++ b/tests/auto/uic/baseline/imagedialog.ui.h
@@ -0,0 +1,222 @@
+/********************************************************************************
+** Form generated from reading ui file 'imagedialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef IMAGEDIALOG_H
+#define IMAGEDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_ImageDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGridLayout *gridLayout;
+    QLabel *widthLabel;
+    QLabel *heightLabel;
+    QComboBox *colorDepthCombo;
+    QLineEdit *nameLineEdit;
+    QSpinBox *spinBox;
+    QSpinBox *spinBox_2;
+    QLabel *nameLabel;
+    QLabel *colorDepthLabel;
+    QSpacerItem *spacerItem;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacerItem1;
+    QPushButton *okButton;
+    QPushButton *cancelButton;
+
+    void setupUi(QDialog *dialog)
+    {
+        if (dialog->objectName().isEmpty())
+            dialog->setObjectName(QString::fromUtf8("dialog"));
+        dialog->setObjectName(QString::fromUtf8("ImageDialog"));
+        dialog->resize(320, 180);
+        vboxLayout = new QVBoxLayout(dialog);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8(""));
+        gridLayout = new QGridLayout();
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+        gridLayout->setMargin(1);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8(""));
+        widthLabel = new QLabel(dialog);
+        widthLabel->setObjectName(QString::fromUtf8("widthLabel"));
+        widthLabel->setGeometry(QRect(1, 27, 67, 22));
+        widthLabel->setFrameShape(QFrame::NoFrame);
+        widthLabel->setFrameShadow(QFrame::Plain);
+        widthLabel->setTextFormat(Qt::AutoText);
+
+        gridLayout->addWidget(widthLabel, 1, 0, 1, 1);
+
+        heightLabel = new QLabel(dialog);
+        heightLabel->setObjectName(QString::fromUtf8("heightLabel"));
+        heightLabel->setGeometry(QRect(1, 55, 67, 22));
+        heightLabel->setFrameShape(QFrame::NoFrame);
+        heightLabel->setFrameShadow(QFrame::Plain);
+        heightLabel->setTextFormat(Qt::AutoText);
+
+        gridLayout->addWidget(heightLabel, 2, 0, 1, 1);
+
+        colorDepthCombo = new QComboBox(dialog);
+        colorDepthCombo->setObjectName(QString::fromUtf8("colorDepthCombo"));
+        colorDepthCombo->setGeometry(QRect(74, 83, 227, 22));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(colorDepthCombo->sizePolicy().hasHeightForWidth());
+        colorDepthCombo->setSizePolicy(sizePolicy);
+        colorDepthCombo->setInsertPolicy(QComboBox::InsertAtBottom);
+
+        gridLayout->addWidget(colorDepthCombo, 3, 1, 1, 1);
+
+        nameLineEdit = new QLineEdit(dialog);
+        nameLineEdit->setObjectName(QString::fromUtf8("nameLineEdit"));
+        nameLineEdit->setGeometry(QRect(74, 83, 227, 22));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy1.setHorizontalStretch(1);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(nameLineEdit->sizePolicy().hasHeightForWidth());
+        nameLineEdit->setSizePolicy(sizePolicy1);
+        nameLineEdit->setEchoMode(QLineEdit::Normal);
+
+        gridLayout->addWidget(nameLineEdit, 0, 1, 1, 1);
+
+        spinBox = new QSpinBox(dialog);
+        spinBox->setObjectName(QString::fromUtf8("spinBox"));
+        spinBox->setGeometry(QRect(74, 1, 227, 20));
+        sizePolicy.setHeightForWidth(spinBox->sizePolicy().hasHeightForWidth());
+        spinBox->setSizePolicy(sizePolicy);
+        spinBox->setButtonSymbols(QAbstractSpinBox::UpDownArrows);
+        spinBox->setValue(32);
+        spinBox->setMaximum(1024);
+        spinBox->setMinimum(1);
+
+        gridLayout->addWidget(spinBox, 1, 1, 1, 1);
+
+        spinBox_2 = new QSpinBox(dialog);
+        spinBox_2->setObjectName(QString::fromUtf8("spinBox_2"));
+        spinBox_2->setGeometry(QRect(74, 27, 227, 22));
+        sizePolicy.setHeightForWidth(spinBox_2->sizePolicy().hasHeightForWidth());
+        spinBox_2->setSizePolicy(sizePolicy);
+        spinBox_2->setButtonSymbols(QAbstractSpinBox::UpDownArrows);
+        spinBox_2->setValue(32);
+        spinBox_2->setMaximum(1024);
+        spinBox_2->setMinimum(1);
+
+        gridLayout->addWidget(spinBox_2, 2, 1, 1, 1);
+
+        nameLabel = new QLabel(dialog);
+        nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
+        nameLabel->setGeometry(QRect(1, 1, 67, 20));
+        nameLabel->setFrameShape(QFrame::NoFrame);
+        nameLabel->setFrameShadow(QFrame::Plain);
+        nameLabel->setTextFormat(Qt::AutoText);
+
+        gridLayout->addWidget(nameLabel, 0, 0, 1, 1);
+
+        colorDepthLabel = new QLabel(dialog);
+        colorDepthLabel->setObjectName(QString::fromUtf8("colorDepthLabel"));
+        colorDepthLabel->setGeometry(QRect(1, 83, 67, 22));
+        colorDepthLabel->setFrameShape(QFrame::NoFrame);
+        colorDepthLabel->setFrameShadow(QFrame::Plain);
+        colorDepthLabel->setTextFormat(Qt::AutoText);
+
+        gridLayout->addWidget(colorDepthLabel, 3, 0, 1, 1);
+
+
+        vboxLayout->addLayout(gridLayout);
+
+        spacerItem = new QSpacerItem(QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(spacerItem);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(1);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8(""));
+        spacerItem1 = new QSpacerItem(QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem1);
+
+        okButton = new QPushButton(dialog);
+        okButton->setObjectName(QString::fromUtf8("okButton"));
+        okButton->setGeometry(QRect(135, 1, 80, 24));
+
+        hboxLayout->addWidget(okButton);
+
+        cancelButton = new QPushButton(dialog);
+        cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
+        cancelButton->setGeometry(QRect(221, 1, 80, 24));
+
+        hboxLayout->addWidget(cancelButton);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        QWidget::setTabOrder(nameLineEdit, spinBox);
+        QWidget::setTabOrder(spinBox, spinBox_2);
+        QWidget::setTabOrder(spinBox_2, colorDepthCombo);
+        QWidget::setTabOrder(colorDepthCombo, okButton);
+        QWidget::setTabOrder(okButton, cancelButton);
+
+        retranslateUi(dialog);
+        QObject::connect(nameLineEdit, SIGNAL(returnPressed()), okButton, SLOT(animateClick()));
+
+        QMetaObject::connectSlotsByName(dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *dialog)
+    {
+        dialog->setWindowTitle(QApplication::translate("ImageDialog", "Create Image", 0, QApplication::UnicodeUTF8));
+        widthLabel->setText(QApplication::translate("ImageDialog", "Width:", 0, QApplication::UnicodeUTF8));
+        heightLabel->setText(QApplication::translate("ImageDialog", "Height:", 0, QApplication::UnicodeUTF8));
+        nameLineEdit->setText(QApplication::translate("ImageDialog", "Untitled image", 0, QApplication::UnicodeUTF8));
+        nameLabel->setText(QApplication::translate("ImageDialog", "Name:", 0, QApplication::UnicodeUTF8));
+        colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", 0, QApplication::UnicodeUTF8));
+        okButton->setText(QApplication::translate("ImageDialog", "OK", 0, QApplication::UnicodeUTF8));
+        cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(dialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class ImageDialog: public Ui_ImageDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // IMAGEDIALOG_H
diff --git a/tests/auto/uic/baseline/inputpage.ui b/tests/auto/uic/baseline/inputpage.ui
new file mode 100644
index 0000000..e7cd3a0
--- /dev/null
+++ b/tests/auto/uic/baseline/inputpage.ui
@@ -0,0 +1,79 @@
+<ui version="4.0" >
+ <class>InputPage</class>
+ <widget class="QWidget" name="InputPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>242</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>File name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLineEdit" name="fileLineEdit" />
+     </item>
+     <item>
+      <widget class="QToolButton" name="browseButton" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/inputpage.ui.h b/tests/auto/uic/baseline/inputpage.ui.h
new file mode 100644
index 0000000..917f91b
--- /dev/null
+++ b/tests/auto/uic/baseline/inputpage.ui.h
@@ -0,0 +1,102 @@
+/********************************************************************************
+** Form generated from reading ui file 'inputpage.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef INPUTPAGE_H
+#define INPUTPAGE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_InputPage
+{
+public:
+    QGridLayout *gridLayout;
+    QSpacerItem *spacerItem;
+    QLabel *label;
+    QHBoxLayout *hboxLayout;
+    QLineEdit *fileLineEdit;
+    QToolButton *browseButton;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QWidget *InputPage)
+    {
+        if (InputPage->objectName().isEmpty())
+            InputPage->setObjectName(QString::fromUtf8("InputPage"));
+        InputPage->resize(417, 242);
+        gridLayout = new QGridLayout(InputPage);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem, 0, 2, 1, 1);
+
+        label = new QLabel(InputPage);
+        label->setObjectName(QString::fromUtf8("label"));
+        QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(label, 1, 0, 1, 1);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setSpacing(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        fileLineEdit = new QLineEdit(InputPage);
+        fileLineEdit->setObjectName(QString::fromUtf8("fileLineEdit"));
+
+        hboxLayout->addWidget(fileLineEdit);
+
+        browseButton = new QToolButton(InputPage);
+        browseButton->setObjectName(QString::fromUtf8("browseButton"));
+
+        hboxLayout->addWidget(browseButton);
+
+
+        gridLayout->addLayout(hboxLayout, 1, 1, 1, 2);
+
+        spacerItem1 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem1, 2, 1, 1, 1);
+
+
+        retranslateUi(InputPage);
+
+        QMetaObject::connectSlotsByName(InputPage);
+    } // setupUi
+
+    void retranslateUi(QWidget *InputPage)
+    {
+        InputPage->setWindowTitle(QApplication::translate("InputPage", "Form", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("InputPage", "File name:", 0, QApplication::UnicodeUTF8));
+        browseButton->setText(QApplication::translate("InputPage", "...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(InputPage);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class InputPage: public Ui_InputPage {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // INPUTPAGE_H
diff --git a/tests/auto/uic/baseline/installdialog.ui b/tests/auto/uic/baseline/installdialog.ui
new file mode 100644
index 0000000..21a05da
--- /dev/null
+++ b/tests/auto/uic/baseline/installdialog.ui
@@ -0,0 +1,118 @@
+<ui version="4.0" >
+ <class>InstallDialog</class>
+ <widget class="QDialog" name="InstallDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>436</width>
+    <height>245</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Install Documentation</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="4" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Available Documentation:</string>
+     </property>
+    </widget>
+   </item>
+   <item rowspan="4" row="1" column="0" colspan="4" >
+    <widget class="QListWidget" name="listWidget" />
+   </item>
+   <item row="1" column="4" >
+    <widget class="QPushButton" name="installButton" >
+     <property name="text" >
+      <string>Install</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="4" >
+    <widget class="QPushButton" name="cancelButton" >
+     <property name="text" >
+      <string>Cancel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="4" >
+    <widget class="QPushButton" name="closeButton" >
+     <property name="text" >
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>56</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Installation Path:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="2" >
+    <widget class="QLineEdit" name="pathLineEdit" />
+   </item>
+   <item row="5" column="3" >
+    <widget class="QToolButton" name="browseButton" >
+     <property name="text" >
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="5" >
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0" colspan="2" >
+    <widget class="QLabel" name="statusLabel" />
+   </item>
+   <item row="7" column="2" colspan="3" >
+    <widget class="QProgressBar" name="progressBar" >
+     <property name="value" >
+      <number>0</number>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>closeButton</sender>
+   <signal>clicked()</signal>
+   <receiver>InstallDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>330</x>
+     <y>107</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>332</x>
+     <y>158</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/installdialog.ui.h b/tests/auto/uic/baseline/installdialog.ui.h
new file mode 100644
index 0000000..d61377d
--- /dev/null
+++ b/tests/auto/uic/baseline/installdialog.ui.h
@@ -0,0 +1,145 @@
+/********************************************************************************
+** Form generated from reading ui file 'installdialog.ui'
+**
+** Created: Thu Jul 10 09:47:34 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef INSTALLDIALOG_H
+#define INSTALLDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListWidget>
+#include <QtGui/QProgressBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_InstallDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QListWidget *listWidget;
+    QPushButton *installButton;
+    QPushButton *cancelButton;
+    QPushButton *closeButton;
+    QSpacerItem *spacerItem;
+    QLabel *label_4;
+    QLineEdit *pathLineEdit;
+    QToolButton *browseButton;
+    QFrame *line;
+    QLabel *statusLabel;
+    QProgressBar *progressBar;
+
+    void setupUi(QDialog *InstallDialog)
+    {
+        if (InstallDialog->objectName().isEmpty())
+            InstallDialog->setObjectName(QString::fromUtf8("InstallDialog"));
+        InstallDialog->resize(436, 245);
+        gridLayout = new QGridLayout(InstallDialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(InstallDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 4);
+
+        listWidget = new QListWidget(InstallDialog);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+
+        gridLayout->addWidget(listWidget, 1, 0, 4, 4);
+
+        installButton = new QPushButton(InstallDialog);
+        installButton->setObjectName(QString::fromUtf8("installButton"));
+
+        gridLayout->addWidget(installButton, 1, 4, 1, 1);
+
+        cancelButton = new QPushButton(InstallDialog);
+        cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
+
+        gridLayout->addWidget(cancelButton, 2, 4, 1, 1);
+
+        closeButton = new QPushButton(InstallDialog);
+        closeButton->setObjectName(QString::fromUtf8("closeButton"));
+
+        gridLayout->addWidget(closeButton, 3, 4, 1, 1);
+
+        spacerItem = new QSpacerItem(20, 56, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem, 4, 4, 1, 1);
+
+        label_4 = new QLabel(InstallDialog);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        gridLayout->addWidget(label_4, 5, 0, 1, 1);
+
+        pathLineEdit = new QLineEdit(InstallDialog);
+        pathLineEdit->setObjectName(QString::fromUtf8("pathLineEdit"));
+
+        gridLayout->addWidget(pathLineEdit, 5, 1, 1, 2);
+
+        browseButton = new QToolButton(InstallDialog);
+        browseButton->setObjectName(QString::fromUtf8("browseButton"));
+
+        gridLayout->addWidget(browseButton, 5, 3, 1, 1);
+
+        line = new QFrame(InstallDialog);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        gridLayout->addWidget(line, 6, 0, 1, 5);
+
+        statusLabel = new QLabel(InstallDialog);
+        statusLabel->setObjectName(QString::fromUtf8("statusLabel"));
+
+        gridLayout->addWidget(statusLabel, 7, 0, 1, 2);
+
+        progressBar = new QProgressBar(InstallDialog);
+        progressBar->setObjectName(QString::fromUtf8("progressBar"));
+        progressBar->setValue(0);
+        progressBar->setOrientation(Qt::Horizontal);
+
+        gridLayout->addWidget(progressBar, 7, 2, 1, 3);
+
+
+        retranslateUi(InstallDialog);
+        QObject::connect(closeButton, SIGNAL(clicked()), InstallDialog, SLOT(accept()));
+
+        QMetaObject::connectSlotsByName(InstallDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *InstallDialog)
+    {
+        InstallDialog->setWindowTitle(QApplication::translate("InstallDialog", "Install Documentation", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("InstallDialog", "Available Documentation:", 0, QApplication::UnicodeUTF8));
+        installButton->setText(QApplication::translate("InstallDialog", "Install", 0, QApplication::UnicodeUTF8));
+        cancelButton->setText(QApplication::translate("InstallDialog", "Cancel", 0, QApplication::UnicodeUTF8));
+        closeButton->setText(QApplication::translate("InstallDialog", "Close", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("InstallDialog", "Installation Path:", 0, QApplication::UnicodeUTF8));
+        browseButton->setText(QApplication::translate("InstallDialog", "...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(InstallDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class InstallDialog: public Ui_InstallDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // INSTALLDIALOG_H
diff --git a/tests/auto/uic/baseline/languagesdialog.ui b/tests/auto/uic/baseline/languagesdialog.ui
new file mode 100644
index 0000000..93b490e
--- /dev/null
+++ b/tests/auto/uic/baseline/languagesdialog.ui
@@ -0,0 +1,160 @@
+<ui version="4.0" >
+ <class>LanguagesDialog</class>
+ <widget class="QDialog" name="LanguagesDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Auxiliary Languages</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <widget class="QTreeWidget" name="languagesList" >
+     <property name="indentation" >
+      <number>0</number>
+     </property>
+     <column>
+      <property name="text" >
+       <string>Locale</string>
+      </property>
+     </column>
+     <column>
+      <property name="text" >
+       <string>File</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QToolButton" name="upButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="toolTip" >
+        <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Move selected language up&lt;/p>&lt;/body>&lt;/html></string>
+       </property>
+       <property name="text" >
+        <string>up</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="linguist.qrc" >
+         <normaloff>:/images/up.png</normaloff>:/images/up.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="downButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="toolTip" >
+        <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">Move selected language down&lt;/p>&lt;/body>&lt;/html></string>
+       </property>
+       <property name="text" >
+        <string>down</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="linguist.qrc" >
+         <normaloff>:/images/down.png</normaloff>:/images/down.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="removeButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="toolTip" >
+        <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Remove selected language&lt;/p>&lt;/body>&lt;/html></string>
+       </property>
+       <property name="text" >
+        <string>remove</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="linguist.qrc" >
+         <normaloff>:/images/editdelete.png</normaloff>:/images/editdelete.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="openFileButton" >
+       <property name="enabled" >
+        <bool>true</bool>
+       </property>
+       <property name="toolTip" >
+        <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Open auxiliary language files&lt;/p>&lt;/body>&lt;/html></string>
+       </property>
+       <property name="text" >
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="linguist.qrc" >
+         <normaloff>:/images/mac/fileopen.png</normaloff>:/images/mac/fileopen.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>121</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="linguist.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>
+   <receiver>LanguagesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>352</x>
+     <y>39</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>233</x>
+     <y>29</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/languagesdialog.ui.h b/tests/auto/uic/baseline/languagesdialog.ui.h
new file mode 100644
index 0000000..a0b9cae
--- /dev/null
+++ b/tests/auto/uic/baseline/languagesdialog.ui.h
@@ -0,0 +1,157 @@
+/********************************************************************************
+** Form generated from reading ui file 'languagesdialog.ui'
+**
+** Created: Mon Jun 16 17:57:32 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef LANGUAGESDIALOG_H
+#define LANGUAGESDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_LanguagesDialog
+{
+public:
+    QVBoxLayout *verticalLayout;
+    QTreeWidget *languagesList;
+    QHBoxLayout *hboxLayout;
+    QToolButton *upButton;
+    QToolButton *downButton;
+    QToolButton *removeButton;
+    QToolButton *openFileButton;
+    QSpacerItem *spacerItem;
+    QPushButton *okButton;
+
+    void setupUi(QDialog *LanguagesDialog)
+    {
+        if (LanguagesDialog->objectName().isEmpty())
+            LanguagesDialog->setObjectName(QString::fromUtf8("LanguagesDialog"));
+        LanguagesDialog->resize(400, 300);
+        verticalLayout = new QVBoxLayout(LanguagesDialog);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        languagesList = new QTreeWidget(LanguagesDialog);
+        languagesList->setObjectName(QString::fromUtf8("languagesList"));
+        languagesList->setIndentation(0);
+
+        verticalLayout->addWidget(languagesList);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        upButton = new QToolButton(LanguagesDialog);
+        upButton->setObjectName(QString::fromUtf8("upButton"));
+        upButton->setEnabled(false);
+        QIcon icon;
+        icon.addPixmap(QPixmap(QString::fromUtf8(":/images/up.png")), QIcon::Normal, QIcon::Off);
+        upButton->setIcon(icon);
+
+        hboxLayout->addWidget(upButton);
+
+        downButton = new QToolButton(LanguagesDialog);
+        downButton->setObjectName(QString::fromUtf8("downButton"));
+        downButton->setEnabled(false);
+        QIcon icon1;
+        icon1.addPixmap(QPixmap(QString::fromUtf8(":/images/down.png")), QIcon::Normal, QIcon::Off);
+        downButton->setIcon(icon1);
+
+        hboxLayout->addWidget(downButton);
+
+        removeButton = new QToolButton(LanguagesDialog);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+        removeButton->setEnabled(false);
+        QIcon icon2;
+        icon2.addPixmap(QPixmap(QString::fromUtf8(":/images/editdelete.png")), QIcon::Normal, QIcon::Off);
+        removeButton->setIcon(icon2);
+
+        hboxLayout->addWidget(removeButton);
+
+        openFileButton = new QToolButton(LanguagesDialog);
+        openFileButton->setObjectName(QString::fromUtf8("openFileButton"));
+        openFileButton->setEnabled(true);
+        QIcon icon3;
+        icon3.addPixmap(QPixmap(QString::fromUtf8(":/images/mac/fileopen.png")), QIcon::Normal, QIcon::Off);
+        openFileButton->setIcon(icon3);
+
+        hboxLayout->addWidget(openFileButton);
+
+        spacerItem = new QSpacerItem(121, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+        okButton = new QPushButton(LanguagesDialog);
+        okButton->setObjectName(QString::fromUtf8("okButton"));
+
+        hboxLayout->addWidget(okButton);
+
+
+        verticalLayout->addLayout(hboxLayout);
+
+
+        retranslateUi(LanguagesDialog);
+        QObject::connect(okButton, SIGNAL(clicked()), LanguagesDialog, SLOT(accept()));
+
+        QMetaObject::connectSlotsByName(LanguagesDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *LanguagesDialog)
+    {
+        LanguagesDialog->setWindowTitle(QApplication::translate("LanguagesDialog", "Auxiliary Languages", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = languagesList->headerItem();
+        ___qtreewidgetitem->setText(1, QApplication::translate("LanguagesDialog", "File", 0, QApplication::UnicodeUTF8));
+        ___qtreewidgetitem->setText(0, QApplication::translate("LanguagesDialog", "Locale", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        upButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Move selected language up</p></body></html>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        upButton->setText(QApplication::translate("LanguagesDialog", "up", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        downButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;\">Move selected language down</p></body></html>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        downButton->setText(QApplication::translate("LanguagesDialog", "down", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        removeButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Remove selected language</p></body></html>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        removeButton->setText(QApplication::translate("LanguagesDialog", "remove", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        openFileButton->setToolTip(QApplication::translate("LanguagesDialog", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Open auxiliary language files</p></body></html>", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        openFileButton->setText(QApplication::translate("LanguagesDialog", "...", 0, QApplication::UnicodeUTF8));
+        okButton->setText(QApplication::translate("LanguagesDialog", "OK", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(LanguagesDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class LanguagesDialog: public Ui_LanguagesDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // LANGUAGESDIALOG_H
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui b/tests/auto/uic/baseline/listwidgeteditor.ui
new file mode 100644
index 0000000..9d3dd69
--- /dev/null
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui
@@ -0,0 +1,225 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::ListWidgetEditor</class>
+ <widget class="QDialog" name="qdesigner_internal::ListWidgetEditor" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>223</width>
+    <height>245</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Items List</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QListWidget" name="listWidget" >
+        <property name="toolTip" >
+         <string>Items List</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout_2" >
+        <item>
+         <widget class="QToolButton" name="newItemButton" >
+          <property name="toolTip" >
+           <string>New Item</string>
+          </property>
+          <property name="text" >
+           <string>&amp;New</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="deleteItemButton" >
+          <property name="toolTip" >
+           <string>Delete Item</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Delete</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>16</width>
+            <height>10</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveItemUpButton" >
+          <property name="toolTip" >
+           <string>Move Item Up</string>
+          </property>
+          <property name="text" >
+           <string>U</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveItemDownButton" >
+          <property name="toolTip" >
+           <string>Move Item Down</string>
+          </property>
+          <property name="text" >
+           <string>D</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>Icon</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="qdesigner_internal::IconSelector" native="1" name="itemIconSelector" />
+        </item>
+        <item>
+         <spacer name="horizontalSpacer" >
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>108</width>
+            <height>21</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+  <zorder>buttonBox</zorder>
+  <zorder>groupBox</zorder>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qdesigner_internal::IconSelector</class>
+   <extends>QWidget</extends>
+   <header>iconselector_p.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>listWidget</tabstop>
+  <tabstop>newItemButton</tabstop>
+  <tabstop>deleteItemButton</tabstop>
+  <tabstop>moveItemUpButton</tabstop>
+  <tabstop>moveItemDownButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qdesigner_internal::ListWidgetEditor</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>140</x>
+     <y>291</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>73</x>
+     <y>301</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qdesigner_internal::ListWidgetEditor</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>230</x>
+     <y>289</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>253</x>
+     <y>304</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/uic/baseline/listwidgeteditor.ui.h
new file mode 100644
index 0000000..316ff39
--- /dev/null
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui.h
@@ -0,0 +1,228 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'listwidgeteditor.ui'
+**
+** Created: Mon Jun 16 17:54:30 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef LISTWIDGETEDITOR_H
+#define LISTWIDGETEDITOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include "iconselector_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_ListWidgetEditor
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout;
+    QListWidget *listWidget;
+    QHBoxLayout *horizontalLayout_2;
+    QToolButton *newItemButton;
+    QToolButton *deleteItemButton;
+    QSpacerItem *spacerItem;
+    QToolButton *moveItemUpButton;
+    QToolButton *moveItemDownButton;
+    QHBoxLayout *horizontalLayout;
+    QLabel *label;
+    qdesigner_internal::IconSelector *itemIconSelector;
+    QSpacerItem *horizontalSpacer;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *qdesigner_internal__ListWidgetEditor)
+    {
+        if (qdesigner_internal__ListWidgetEditor->objectName().isEmpty())
+            qdesigner_internal__ListWidgetEditor->setObjectName(QString::fromUtf8("qdesigner_internal__ListWidgetEditor"));
+        qdesigner_internal__ListWidgetEditor->resize(223, 245);
+        vboxLayout = new QVBoxLayout(qdesigner_internal__ListWidgetEditor);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(qdesigner_internal__ListWidgetEditor);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        gridLayout = new QGridLayout(groupBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        listWidget = new QListWidget(groupBox);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+
+        gridLayout->addWidget(listWidget, 0, 0, 1, 1);
+
+        horizontalLayout_2 = new QHBoxLayout();
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        newItemButton = new QToolButton(groupBox);
+        newItemButton->setObjectName(QString::fromUtf8("newItemButton"));
+
+        horizontalLayout_2->addWidget(newItemButton);
+
+        deleteItemButton = new QToolButton(groupBox);
+        deleteItemButton->setObjectName(QString::fromUtf8("deleteItemButton"));
+
+        horizontalLayout_2->addWidget(deleteItemButton);
+
+        spacerItem = new QSpacerItem(16, 10, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_2->addItem(spacerItem);
+
+        moveItemUpButton = new QToolButton(groupBox);
+        moveItemUpButton->setObjectName(QString::fromUtf8("moveItemUpButton"));
+
+        horizontalLayout_2->addWidget(moveItemUpButton);
+
+        moveItemDownButton = new QToolButton(groupBox);
+        moveItemDownButton->setObjectName(QString::fromUtf8("moveItemDownButton"));
+
+        horizontalLayout_2->addWidget(moveItemDownButton);
+
+
+        gridLayout->addLayout(horizontalLayout_2, 1, 0, 1, 1);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        horizontalLayout->addWidget(label);
+
+        itemIconSelector = new qdesigner_internal::IconSelector(groupBox);
+        itemIconSelector->setObjectName(QString::fromUtf8("itemIconSelector"));
+
+        horizontalLayout->addWidget(itemIconSelector);
+
+        horizontalSpacer = new QSpacerItem(108, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(horizontalSpacer);
+
+
+        gridLayout->addLayout(horizontalLayout, 2, 0, 1, 1);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        buttonBox = new QDialogButtonBox(qdesigner_internal__ListWidgetEditor);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+        buttonBox->raise();
+        groupBox->raise();
+        QWidget::setTabOrder(listWidget, newItemButton);
+        QWidget::setTabOrder(newItemButton, deleteItemButton);
+        QWidget::setTabOrder(deleteItemButton, moveItemUpButton);
+        QWidget::setTabOrder(moveItemUpButton, moveItemDownButton);
+
+        retranslateUi(qdesigner_internal__ListWidgetEditor);
+        QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__ListWidgetEditor, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__ListWidgetEditor, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__ListWidgetEditor);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__ListWidgetEditor)
+    {
+        qdesigner_internal__ListWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Dialog", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        listWidget->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Items List", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        newItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "New Item", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Delete Item", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        deleteItemButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "&Delete", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveItemUpButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "U", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Move Item Down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveItemDownButton->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::ListWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__ListWidgetEditor);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class ListWidgetEditor: public Ui_ListWidgetEditor {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // LISTWIDGETEDITOR_H
diff --git a/tests/auto/uic/baseline/mainwindow.ui b/tests/auto/uic/baseline/mainwindow.ui
new file mode 100644
index 0000000..f6eda4f
--- /dev/null
+++ b/tests/auto/uic/baseline/mainwindow.ui
@@ -0,0 +1,502 @@
+<ui version="4.0" >
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>829</width>
+    <height>813</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MakeQPF</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QGroupBox" name="groupBox" >
+      <property name="title" >
+       <string>Font Properties</string>
+      </property>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Family:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QFontComboBox" name="fontComboBox" />
+       </item>
+       <item>
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Pixel Size:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="pixelSize" >
+         <property name="minimum" >
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_7" >
+         <property name="text" >
+          <string>Weight:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="weightCombo" />
+       </item>
+       <item>
+        <widget class="QCheckBox" name="italic" >
+         <property name="text" >
+          <string>Italic</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <widget class="QGroupBox" name="groupBox_2" >
+      <property name="title" >
+       <string>Glyph Coverage</string>
+      </property>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QRadioButton" name="chooseFromCodePoints" >
+         <property name="text" >
+          <string>Choose from Unicode Codepoints:</string>
+         </property>
+         <property name="checked" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QListWidget" name="characterRangeView" />
+         </item>
+         <item>
+          <layout class="QHBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="QPushButton" name="selectAll" >
+             <property name="text" >
+              <string>Select &amp;All</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="deselectAll" >
+             <property name="text" >
+              <string>&amp;Deselect All</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="invertSelection" >
+             <property name="text" >
+              <string>&amp;Invert Selection</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="chooseFromSampleFile" >
+         <property name="text" >
+          <string>Choose from Sample Text File (UTF-8 Encoded):</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label_5" >
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+           <property name="text" >
+            <string>Path:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="sampleFile" >
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="browseSampleFile" >
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+           <property name="text" >
+            <string>Browse...</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="charCount" >
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+           <property name="text" >
+            <string>TextLabel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <widget class="QGroupBox" name="groupBox_3" >
+      <property name="title" >
+       <string>Preview</string>
+      </property>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLineEdit" name="preview" />
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <widget class="QGroupBox" name="groupBox_4" >
+      <property name="title" >
+       <string>Output Options</string>
+      </property>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_3" >
+         <property name="text" >
+          <string>Path:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="path" />
+       </item>
+       <item>
+        <widget class="QPushButton" name="browsePath" >
+         <property name="text" >
+          <string>Browse...</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_4" >
+         <property name="text" >
+          <string>Filename:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="fileName" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="generate" >
+        <property name="text" >
+         <string>Generate Pre-Rendered Font...</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>829</width>
+     <height>29</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <addaction name="actionAdd_Custom_Font" />
+    <addaction name="separator" />
+    <addaction name="action_Exit" />
+   </widget>
+   <addaction name="menuFile" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <action name="actionAdd_Custom_Font" >
+   <property name="text" >
+    <string>&amp;Add Custom Font...</string>
+   </property>
+  </action>
+  <action name="action_Exit" >
+   <property name="text" >
+    <string>&amp;Exit</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>action_Exit</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>383</x>
+     <y>215</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromCodePoints</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>characterRangeView</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>183</x>
+     <y>144</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>146</x>
+     <y>295</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromCodePoints</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>selectAll</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>236</x>
+     <y>146</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>46</x>
+     <y>508</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromCodePoints</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>deselectAll</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>280</x>
+     <y>147</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>158</x>
+     <y>502</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromCodePoints</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>invertSelection</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>364</x>
+     <y>143</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>281</x>
+     <y>509</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromSampleFile</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>sampleFile</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>134</x>
+     <y>544</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>64</x>
+     <y>569</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromSampleFile</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>browseSampleFile</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>79</x>
+     <y>545</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>710</x>
+     <y>582</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromSampleFile</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>charCount</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>274</x>
+     <y>544</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>790</x>
+     <y>569</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>chooseFromSampleFile</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>label_5</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>112</x>
+     <y>541</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>37</x>
+     <y>579</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/mainwindow.ui.h b/tests/auto/uic/baseline/mainwindow.ui.h
new file mode 100644
index 0000000..69e45f5
--- /dev/null
+++ b/tests/auto/uic/baseline/mainwindow.ui.h
@@ -0,0 +1,401 @@
+/********************************************************************************
+** Form generated from reading ui file 'mainwindow.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QFontComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListWidget>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QStatusBar>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWindow
+{
+public:
+    QAction *actionAdd_Custom_Font;
+    QAction *action_Exit;
+    QWidget *centralwidget;
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QHBoxLayout *hboxLayout;
+    QLabel *label;
+    QFontComboBox *fontComboBox;
+    QLabel *label_2;
+    QSpinBox *pixelSize;
+    QLabel *label_7;
+    QComboBox *weightCombo;
+    QCheckBox *italic;
+    QSpacerItem *spacerItem;
+    QGroupBox *groupBox_2;
+    QVBoxLayout *vboxLayout1;
+    QRadioButton *chooseFromCodePoints;
+    QVBoxLayout *vboxLayout2;
+    QListWidget *characterRangeView;
+    QHBoxLayout *hboxLayout1;
+    QPushButton *selectAll;
+    QPushButton *deselectAll;
+    QPushButton *invertSelection;
+    QSpacerItem *spacerItem1;
+    QRadioButton *chooseFromSampleFile;
+    QHBoxLayout *hboxLayout2;
+    QLabel *label_5;
+    QLineEdit *sampleFile;
+    QPushButton *browseSampleFile;
+    QLabel *charCount;
+    QGroupBox *groupBox_3;
+    QHBoxLayout *hboxLayout3;
+    QLineEdit *preview;
+    QGroupBox *groupBox_4;
+    QHBoxLayout *hboxLayout4;
+    QLabel *label_3;
+    QLineEdit *path;
+    QPushButton *browsePath;
+    QLabel *label_4;
+    QLineEdit *fileName;
+    QHBoxLayout *hboxLayout5;
+    QPushButton *generate;
+    QSpacerItem *spacerItem2;
+    QMenuBar *menubar;
+    QMenu *menuFile;
+    QStatusBar *statusbar;
+
+    void setupUi(QMainWindow *MainWindow)
+    {
+        if (MainWindow->objectName().isEmpty())
+            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
+        MainWindow->resize(829, 813);
+        actionAdd_Custom_Font = new QAction(MainWindow);
+        actionAdd_Custom_Font->setObjectName(QString::fromUtf8("actionAdd_Custom_Font"));
+        action_Exit = new QAction(MainWindow);
+        action_Exit->setObjectName(QString::fromUtf8("action_Exit"));
+        centralwidget = new QWidget(MainWindow);
+        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
+        vboxLayout = new QVBoxLayout(centralwidget);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(centralwidget);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        hboxLayout = new QHBoxLayout(groupBox);
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(9);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        hboxLayout->addWidget(label);
+
+        fontComboBox = new QFontComboBox(groupBox);
+        fontComboBox->setObjectName(QString::fromUtf8("fontComboBox"));
+
+        hboxLayout->addWidget(fontComboBox);
+
+        label_2 = new QLabel(groupBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        hboxLayout->addWidget(label_2);
+
+        pixelSize = new QSpinBox(groupBox);
+        pixelSize->setObjectName(QString::fromUtf8("pixelSize"));
+        pixelSize->setMinimum(1);
+
+        hboxLayout->addWidget(pixelSize);
+
+        label_7 = new QLabel(groupBox);
+        label_7->setObjectName(QString::fromUtf8("label_7"));
+
+        hboxLayout->addWidget(label_7);
+
+        weightCombo = new QComboBox(groupBox);
+        weightCombo->setObjectName(QString::fromUtf8("weightCombo"));
+
+        hboxLayout->addWidget(weightCombo);
+
+        italic = new QCheckBox(groupBox);
+        italic->setObjectName(QString::fromUtf8("italic"));
+
+        hboxLayout->addWidget(italic);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        groupBox_2 = new QGroupBox(centralwidget);
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        vboxLayout1 = new QVBoxLayout(groupBox_2);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(9);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        chooseFromCodePoints = new QRadioButton(groupBox_2);
+        chooseFromCodePoints->setObjectName(QString::fromUtf8("chooseFromCodePoints"));
+        chooseFromCodePoints->setChecked(true);
+
+        vboxLayout1->addWidget(chooseFromCodePoints);
+
+        vboxLayout2 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+        vboxLayout2->setMargin(0);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        characterRangeView = new QListWidget(groupBox_2);
+        characterRangeView->setObjectName(QString::fromUtf8("characterRangeView"));
+
+        vboxLayout2->addWidget(characterRangeView);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        selectAll = new QPushButton(groupBox_2);
+        selectAll->setObjectName(QString::fromUtf8("selectAll"));
+
+        hboxLayout1->addWidget(selectAll);
+
+        deselectAll = new QPushButton(groupBox_2);
+        deselectAll->setObjectName(QString::fromUtf8("deselectAll"));
+
+        hboxLayout1->addWidget(deselectAll);
+
+        invertSelection = new QPushButton(groupBox_2);
+        invertSelection->setObjectName(QString::fromUtf8("invertSelection"));
+
+        hboxLayout1->addWidget(invertSelection);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem1);
+
+
+        vboxLayout2->addLayout(hboxLayout1);
+
+
+        vboxLayout1->addLayout(vboxLayout2);
+
+        chooseFromSampleFile = new QRadioButton(groupBox_2);
+        chooseFromSampleFile->setObjectName(QString::fromUtf8("chooseFromSampleFile"));
+
+        vboxLayout1->addWidget(chooseFromSampleFile);
+
+        hboxLayout2 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout2->setSpacing(6);
+#endif
+        hboxLayout2->setMargin(0);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        label_5 = new QLabel(groupBox_2);
+        label_5->setObjectName(QString::fromUtf8("label_5"));
+        label_5->setEnabled(false);
+
+        hboxLayout2->addWidget(label_5);
+
+        sampleFile = new QLineEdit(groupBox_2);
+        sampleFile->setObjectName(QString::fromUtf8("sampleFile"));
+        sampleFile->setEnabled(false);
+
+        hboxLayout2->addWidget(sampleFile);
+
+        browseSampleFile = new QPushButton(groupBox_2);
+        browseSampleFile->setObjectName(QString::fromUtf8("browseSampleFile"));
+        browseSampleFile->setEnabled(false);
+
+        hboxLayout2->addWidget(browseSampleFile);
+
+        charCount = new QLabel(groupBox_2);
+        charCount->setObjectName(QString::fromUtf8("charCount"));
+        charCount->setEnabled(false);
+
+        hboxLayout2->addWidget(charCount);
+
+
+        vboxLayout1->addLayout(hboxLayout2);
+
+
+        vboxLayout->addWidget(groupBox_2);
+
+        groupBox_3 = new QGroupBox(centralwidget);
+        groupBox_3->setObjectName(QString::fromUtf8("groupBox_3"));
+        hboxLayout3 = new QHBoxLayout(groupBox_3);
+#ifndef Q_OS_MAC
+        hboxLayout3->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout3->setMargin(9);
+#endif
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        preview = new QLineEdit(groupBox_3);
+        preview->setObjectName(QString::fromUtf8("preview"));
+
+        hboxLayout3->addWidget(preview);
+
+
+        vboxLayout->addWidget(groupBox_3);
+
+        groupBox_4 = new QGroupBox(centralwidget);
+        groupBox_4->setObjectName(QString::fromUtf8("groupBox_4"));
+        hboxLayout4 = new QHBoxLayout(groupBox_4);
+#ifndef Q_OS_MAC
+        hboxLayout4->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout4->setMargin(9);
+#endif
+        hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
+        label_3 = new QLabel(groupBox_4);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        hboxLayout4->addWidget(label_3);
+
+        path = new QLineEdit(groupBox_4);
+        path->setObjectName(QString::fromUtf8("path"));
+
+        hboxLayout4->addWidget(path);
+
+        browsePath = new QPushButton(groupBox_4);
+        browsePath->setObjectName(QString::fromUtf8("browsePath"));
+
+        hboxLayout4->addWidget(browsePath);
+
+        label_4 = new QLabel(groupBox_4);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        hboxLayout4->addWidget(label_4);
+
+        fileName = new QLineEdit(groupBox_4);
+        fileName->setObjectName(QString::fromUtf8("fileName"));
+        fileName->setEnabled(false);
+
+        hboxLayout4->addWidget(fileName);
+
+
+        vboxLayout->addWidget(groupBox_4);
+
+        hboxLayout5 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout5->setSpacing(6);
+#endif
+        hboxLayout5->setMargin(0);
+        hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
+        generate = new QPushButton(centralwidget);
+        generate->setObjectName(QString::fromUtf8("generate"));
+
+        hboxLayout5->addWidget(generate);
+
+        spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout5->addItem(spacerItem2);
+
+
+        vboxLayout->addLayout(hboxLayout5);
+
+        MainWindow->setCentralWidget(centralwidget);
+        menubar = new QMenuBar(MainWindow);
+        menubar->setObjectName(QString::fromUtf8("menubar"));
+        menubar->setGeometry(QRect(0, 0, 829, 29));
+        menuFile = new QMenu(menubar);
+        menuFile->setObjectName(QString::fromUtf8("menuFile"));
+        MainWindow->setMenuBar(menubar);
+        statusbar = new QStatusBar(MainWindow);
+        statusbar->setObjectName(QString::fromUtf8("statusbar"));
+        MainWindow->setStatusBar(statusbar);
+
+        menubar->addAction(menuFile->menuAction());
+        menuFile->addAction(actionAdd_Custom_Font);
+        menuFile->addSeparator();
+        menuFile->addAction(action_Exit);
+
+        retranslateUi(MainWindow);
+        QObject::connect(action_Exit, SIGNAL(triggered()), MainWindow, SLOT(close()));
+        QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), characterRangeView, SLOT(setEnabled(bool)));
+        QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), selectAll, SLOT(setEnabled(bool)));
+        QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), deselectAll, SLOT(setEnabled(bool)));
+        QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), invertSelection, SLOT(setEnabled(bool)));
+        QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), sampleFile, SLOT(setEnabled(bool)));
+        QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), browseSampleFile, SLOT(setEnabled(bool)));
+        QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), charCount, SLOT(setEnabled(bool)));
+        QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), label_5, SLOT(setEnabled(bool)));
+
+        QMetaObject::connectSlotsByName(MainWindow);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *MainWindow)
+    {
+        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MakeQPF", 0, QApplication::UnicodeUTF8));
+        actionAdd_Custom_Font->setText(QApplication::translate("MainWindow", "&Add Custom Font...", 0, QApplication::UnicodeUTF8));
+        action_Exit->setText(QApplication::translate("MainWindow", "&Exit", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("MainWindow", "Font Properties", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("MainWindow", "Family:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("MainWindow", "Pixel Size:", 0, QApplication::UnicodeUTF8));
+        label_7->setText(QApplication::translate("MainWindow", "Weight:", 0, QApplication::UnicodeUTF8));
+        italic->setText(QApplication::translate("MainWindow", "Italic", 0, QApplication::UnicodeUTF8));
+        groupBox_2->setTitle(QApplication::translate("MainWindow", "Glyph Coverage", 0, QApplication::UnicodeUTF8));
+        chooseFromCodePoints->setText(QApplication::translate("MainWindow", "Choose from Unicode Codepoints:", 0, QApplication::UnicodeUTF8));
+        selectAll->setText(QApplication::translate("MainWindow", "Select &All", 0, QApplication::UnicodeUTF8));
+        deselectAll->setText(QApplication::translate("MainWindow", "&Deselect All", 0, QApplication::UnicodeUTF8));
+        invertSelection->setText(QApplication::translate("MainWindow", "&Invert Selection", 0, QApplication::UnicodeUTF8));
+        chooseFromSampleFile->setText(QApplication::translate("MainWindow", "Choose from Sample Text File (UTF-8 Encoded):", 0, QApplication::UnicodeUTF8));
+        label_5->setText(QApplication::translate("MainWindow", "Path:", 0, QApplication::UnicodeUTF8));
+        browseSampleFile->setText(QApplication::translate("MainWindow", "Browse...", 0, QApplication::UnicodeUTF8));
+        charCount->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
+        groupBox_3->setTitle(QApplication::translate("MainWindow", "Preview", 0, QApplication::UnicodeUTF8));
+        groupBox_4->setTitle(QApplication::translate("MainWindow", "Output Options", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("MainWindow", "Path:", 0, QApplication::UnicodeUTF8));
+        browsePath->setText(QApplication::translate("MainWindow", "Browse...", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("MainWindow", "Filename:", 0, QApplication::UnicodeUTF8));
+        generate->setText(QApplication::translate("MainWindow", "Generate Pre-Rendered Font...", 0, QApplication::UnicodeUTF8));
+        menuFile->setTitle(QApplication::translate("MainWindow", "File", 0, QApplication::UnicodeUTF8));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class MainWindow: public Ui_MainWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // MAINWINDOW_H
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui b/tests/auto/uic/baseline/mainwindowbase.ui
new file mode 100644
index 0000000..fd88ab1
--- /dev/null
+++ b/tests/auto/uic/baseline/mainwindowbase.ui
@@ -0,0 +1,1213 @@
+<ui version="4.0" >
+ <author></author>
+  <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <exportmacro></exportmacro>
+ <class>MainWindowBase</class>
+ <widget class="Q3MainWindow" name="MainWindowBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>724</width>
+    <height>615</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt Configuration</string>
+  </property>
+  <widget class="QWidget" name="widget" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>28</y>
+     <width>724</width>
+     <height>587</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" >
+    <property name="margin" >
+     <number>8</number>
+    </property>
+    <property name="spacing" >
+     <number>4</number>
+    </property>
+    <item>
+     <widget class="QTextEdit" name="helpview" >
+      <property name="minimumSize" >
+       <size>
+        <width>200</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="readOnly" >
+        <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QTabWidget" name="TabWidget3" >
+      <widget class="QWidget" name="tab1" >
+       <attribute name="title" >
+        <string>Appearance</string>
+       </attribute>
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>4</number>
+        </property>
+        <property name="spacing" >
+         <number>4</number>
+        </property>
+        <item>
+         <widget class="QGroupBox" name="GroupBox40" >
+          <property name="title" >
+           <string>GUI Style</string>
+          </property>
+          <layout class="QHBoxLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="gstylebuddy" >
+             <property name="text" >
+              <string>Select GUI &amp;Style:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>gstylecombo</cstring>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="gstylecombo" />
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="groupAutoPalette" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>5</hsizetype>
+            <vsizetype>4</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="title" >
+           <string>Build Palette</string>
+          </property>
+          <layout class="QHBoxLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="labelMainColor" >
+             <property name="text" >
+              <string>&amp;3-D Effects:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>buttonMainColor</cstring>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ColorButton" name="buttonMainColor" />
+           </item>
+           <item>
+            <widget class="QLabel" name="labelMainColor2" >
+             <property name="sizePolicy" >
+              <sizepolicy>
+               <hsizetype>1</hsizetype>
+               <vsizetype>1</vsizetype>
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="lineWidth" >
+              <number>1</number>
+             </property>
+             <property name="midLineWidth" >
+              <number>0</number>
+             </property>
+             <property name="text" >
+              <string>Window Back&amp;ground:</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignVCenter</set>
+             </property>
+             <property name="margin" >
+              <number>0</number>
+             </property>
+             <property name="buddy" >
+              <cstring>buttonMainColor2</cstring>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ColorButton" name="buttonMainColor2" />
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType" >
+              <enum>QSizePolicy::Expanding</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>70</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="btnAdvanced" >
+             <property name="text" >
+              <string>&amp;Tune Palette...</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="GroupBox126" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>5</hsizetype>
+            <vsizetype>7</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="title" >
+           <string>Preview</string>
+          </property>
+          <layout class="QGridLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="TextLabel1" >
+             <property name="text" >
+              <string>Select &amp;Palette:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>paletteCombo</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1" >
+            <widget class="QComboBox" name="paletteCombo" >
+             <item>
+              <property name="text" >
+               <string>Active Palette</string>
+              </property>
+             </item>
+             <item>
+              <property name="text" >
+               <string>Inactive Palette</string>
+              </property>
+             </item>
+             <item>
+              <property name="text" >
+               <string>Disabled Palette</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item row="1" column="0" colspan="2" >
+            <widget class="PreviewFrame" name="previewFrame" >
+             <property name="sizePolicy" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>7</vsizetype>
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize" >
+              <size>
+               <width>410</width>
+               <height>260</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="tab2" >
+       <attribute name="title" >
+        <string>Fonts</string>
+       </attribute>
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>8</number>
+        </property>
+        <property name="spacing" >
+         <number>4</number>
+        </property>
+        <item>
+         <widget class="QGroupBox" name="GroupBox1" >
+          <property name="title" >
+           <string>Default Font</string>
+          </property>
+          <layout class="QGridLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item row="1" column="1" >
+            <widget class="QComboBox" name="stylecombo" >
+             <property name="autoCompletion" >
+              <bool>true</bool>
+             </property>
+             <property name="duplicatesEnabled" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1" >
+            <widget class="QComboBox" name="familycombo" >
+             <property name="autoCompletion" >
+              <bool>true</bool>
+             </property>
+             <property name="duplicatesEnabled" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1" >
+            <widget class="QComboBox" name="psizecombo" >
+             <property name="editable" >
+              <bool>true</bool>
+             </property>
+             <property name="autoCompletion" >
+              <bool>true</bool>
+             </property>
+             <property name="duplicatesEnabled" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QLabel" name="stylebuddy" >
+             <property name="text" >
+              <string>&amp;Style:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>stylecombo</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" >
+            <widget class="QLabel" name="psizebuddy" >
+             <property name="text" >
+              <string>&amp;Point Size:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>psizecombo</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="familybuddy" >
+             <property name="text" >
+              <string>F&amp;amily:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>familycombo</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" colspan="2" >
+            <widget class="QLineEdit" name="samplelineedit" >
+             <property name="text" >
+              <string>Sample Text</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignHCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="GroupBox2" >
+          <property name="title" >
+           <string>Font Substitution</string>
+          </property>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item>
+            <layout class="QHBoxLayout" >
+             <property name="margin" >
+              <number>0</number>
+             </property>
+             <property name="spacing" >
+              <number>4</number>
+             </property>
+             <item>
+              <widget class="QLabel" name="famsubbuddy" >
+               <property name="text" >
+                <string>S&amp;elect or Enter a Family:</string>
+               </property>
+               <property name="buddy" >
+                <cstring>familysubcombo</cstring>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="familysubcombo" >
+               <property name="editable" >
+                <bool>true</bool>
+               </property>
+               <property name="autoCompletion" >
+                <bool>true</bool>
+               </property>
+               <property name="duplicatesEnabled" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="Line" name="Line1" >
+             <property name="frameShape" >
+              <enum>QFrame::HLine</enum>
+             </property>
+             <property name="frameShadow" >
+              <enum>QFrame::Sunken</enum>
+             </property>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="TextLabel5" >
+             <property name="text" >
+              <string>Current Substitutions:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="Q3ListBox" name="sublistbox" />
+           </item>
+           <item>
+            <layout class="QHBoxLayout" >
+             <property name="margin" >
+              <number>0</number>
+             </property>
+             <property name="spacing" >
+              <number>4</number>
+             </property>
+             <item>
+              <widget class="QPushButton" name="PushButton2" >
+               <property name="text" >
+                <string>Up</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="PushButton3" >
+               <property name="text" >
+                <string>Down</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="PushButton4" >
+               <property name="text" >
+                <string>Remove</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <widget class="Line" name="Line2" >
+             <property name="frameShape" >
+              <enum>QFrame::HLine</enum>
+             </property>
+             <property name="frameShadow" >
+              <enum>QFrame::Sunken</enum>
+             </property>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" >
+             <property name="margin" >
+              <number>0</number>
+             </property>
+             <property name="spacing" >
+              <number>4</number>
+             </property>
+             <item>
+              <widget class="QLabel" name="choosebuddy" >
+               <property name="text" >
+                <string>Select s&amp;ubstitute Family:</string>
+               </property>
+               <property name="buddy" >
+                <cstring>choosesubcombo</cstring>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="choosesubcombo" >
+               <property name="autoCompletion" >
+                <bool>true</bool>
+               </property>
+               <property name="duplicatesEnabled" >
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="PushButton1" >
+               <property name="text" >
+                <string>Add</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="tab" >
+       <attribute name="title" >
+        <string>Interface</string>
+       </attribute>
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>7</number>
+        </property>
+        <property name="spacing" >
+         <number>4</number>
+        </property>
+        <item>
+         <widget class="QGroupBox" name="GroupBox4" >
+          <property name="title" >
+           <string>Feel Settings</string>
+          </property>
+          <layout class="QGridLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item row="0" column="1" >
+            <widget class="QSpinBox" name="dcispin" >
+             <property name="suffix" >
+              <string> ms</string>
+             </property>
+             <property name="maximum" >
+              <number>10000</number>
+             </property>
+             <property name="minimum" >
+              <number>10</number>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="dcibuddy" >
+             <property name="text" >
+              <string>&amp;Double Click Interval:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>dcispin</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1" >
+            <widget class="QSpinBox" name="cfispin" >
+             <property name="specialValueText" >
+              <string>No blinking</string>
+             </property>
+             <property name="suffix" >
+              <string> ms</string>
+             </property>
+             <property name="maximum" >
+              <number>10000</number>
+             </property>
+             <property name="minimum" >
+              <number>9</number>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QLabel" name="cfibuddy" >
+             <property name="text" >
+              <string>&amp;Cursor Flash Time:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>cfispin</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1" >
+            <widget class="QSpinBox" name="wslspin" >
+             <property name="suffix" >
+              <string> lines</string>
+             </property>
+             <property name="maximum" >
+              <number>20</number>
+             </property>
+             <property name="minimum" >
+              <number>1</number>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" >
+            <widget class="QLabel" name="wslbuddy" >
+             <property name="text" >
+              <string>Wheel &amp;Scroll Lines:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>wslspin</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" colspan="2" >
+            <widget class="QCheckBox" name="resolvelinks" >
+             <property name="text" >
+              <string>Resolve symlinks in URLs</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="GroupBox3" >
+          <property name="title" >
+           <string>GUI Effects</string>
+          </property>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item>
+            <widget class="QCheckBox" name="effectcheckbox" >
+             <property name="text" >
+              <string>&amp;Enable</string>
+             </property>
+             <property name="shortcut" >
+              <string>Alt+E</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="Q3Frame" name="effectbase" >
+             <property name="frameShape" >
+              <enum>QFrame::NoFrame</enum>
+             </property>
+             <property name="frameShadow" >
+              <enum>QFrame::Plain</enum>
+             </property>
+             <layout class="QGridLayout" >
+              <property name="margin" >
+               <number>0</number>
+              </property>
+              <property name="spacing" >
+               <number>4</number>
+              </property>
+              <item row="0" column="0" >
+               <widget class="QLabel" name="meffectbuddy" >
+                <property name="text" >
+                 <string>&amp;Menu Effect:</string>
+                </property>
+                <property name="buddy" >
+                 <cstring>menueffect</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0" >
+               <widget class="QLabel" name="ceffectbuddy" >
+                <property name="text" >
+                 <string>C&amp;omboBox Effect:</string>
+                </property>
+                <property name="buddy" >
+                 <cstring>comboeffect</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0" >
+               <widget class="QLabel" name="teffectbuddy" >
+                <property name="text" >
+                 <string>&amp;ToolTip Effect:</string>
+                </property>
+                <property name="buddy" >
+                 <cstring>tooltipeffect</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0" >
+               <widget class="QLabel" name="beffectbuddy" >
+                <property name="text" >
+                 <string>Tool&amp;Box Effect:</string>
+                </property>
+                <property name="buddy" >
+                 <cstring>toolboxeffect</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1" >
+               <widget class="QComboBox" name="menueffect" >
+                <property name="currentIndex" >
+                 <number>0</number>
+                </property>
+                <property name="autoCompletion" >
+                 <bool>true</bool>
+                </property>
+                <item>
+                 <property name="text" >
+                  <string>Disable</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text" >
+                  <string>Animate</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text" >
+                  <string>Fade</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="1" column="1" >
+               <widget class="QComboBox" name="comboeffect" >
+                <item>
+                 <property name="text" >
+                  <string>Disable</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text" >
+                  <string>Animate</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="2" column="1" >
+               <widget class="QComboBox" name="tooltipeffect" >
+                <item>
+                 <property name="text" >
+                  <string>Disable</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text" >
+                  <string>Animate</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text" >
+                  <string>Fade</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="3" column="1" >
+               <widget class="QComboBox" name="toolboxeffect" >
+                <item>
+                 <property name="text" >
+                  <string>Disable</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text" >
+                  <string>Animate</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="GroupBox5" >
+          <property name="title" >
+           <string>Global Strut</string>
+          </property>
+          <layout class="QGridLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="swbuddy" >
+             <property name="text" >
+              <string>Minimum &amp;Width:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>strutwidth</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0" >
+            <widget class="QLabel" name="shbuddy" >
+             <property name="text" >
+              <string>Minimum Hei&amp;ght:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>strutheight</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1" >
+            <widget class="QSpinBox" name="strutwidth" >
+             <property name="suffix" >
+              <string> pixels</string>
+             </property>
+             <property name="maximum" >
+              <number>1000</number>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1" >
+            <widget class="QSpinBox" name="strutheight" >
+             <property name="suffix" >
+              <string> pixels</string>
+             </property>
+             <property name="maximum" >
+              <number>1000</number>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="rtlExtensions" >
+          <property name="text" >
+           <string>Enhanced support for languages written right-to-left</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="inputStyleLabel" >
+          <property name="text" >
+           <string>XIM Input Style:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="inputStyle" >
+          <property name="currentIndex" >
+           <number>0</number>
+          </property>
+          <item>
+           <property name="text" >
+            <string>On The Spot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>Over The Spot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>Off The Spot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>Root</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeType" >
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="tab3" >
+       <attribute name="title" >
+        <string>Printer</string>
+       </attribute>
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>8</number>
+        </property>
+        <property name="spacing" >
+         <number>4</number>
+        </property>
+        <item>
+         <widget class="QCheckBox" name="fontembeddingcheckbox" >
+          <property name="text" >
+           <string>Enable Font embedding</string>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="GroupBox10" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>5</hsizetype>
+            <vsizetype>7</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="title" >
+           <string>Font Paths</string>
+          </property>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>8</number>
+           </property>
+           <property name="spacing" >
+            <number>4</number>
+           </property>
+           <item>
+            <layout class="QGridLayout" >
+             <property name="margin" >
+              <number>0</number>
+             </property>
+             <property name="spacing" >
+              <number>4</number>
+             </property>
+             <item row="1" column="0" >
+              <widget class="QPushButton" name="PushButton11" >
+               <property name="text" >
+                <string>Up</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="2" >
+              <widget class="QPushButton" name="PushButton13" >
+               <property name="text" >
+                <string>Remove</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1" >
+              <widget class="QPushButton" name="PushButton12" >
+               <property name="text" >
+                <string>Down</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0" colspan="3" >
+              <widget class="Q3ListBox" name="fontpathlistbox" />
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QGridLayout" >
+             <property name="margin" >
+              <number>0</number>
+             </property>
+             <property name="spacing" >
+              <number>4</number>
+             </property>
+             <item row="2" column="0" >
+              <spacer>
+               <property name="orientation" >
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType" >
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" >
+                <size>
+                 <width>20</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item row="2" column="2" >
+              <widget class="QPushButton" name="PushButton15" >
+               <property name="text" >
+                <string>Add</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1" >
+              <widget class="QPushButton" name="PushButton14" >
+               <property name="text" >
+                <string>Browse...</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0" colspan="3" >
+              <widget class="QLabel" name="TextLabel15_2" >
+               <property name="text" >
+                <string>Press the &lt;b>Browse&lt;/b> button or enter a directory and press Enter to add them to the list.</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" colspan="3" >
+              <widget class="QLineEdit" name="fontpathlineedit" />
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>724</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="PopupMenu" >
+    <property name="geometry" >
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>800</width>
+      <height>480</height>
+     </rect>
+    </property>
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <action name="" />
+    <action name="" />
+    <action name="" />
+    <addaction name="fileSaveAction" />
+    <addaction name="separator" />
+    <addaction name="fileExitAction" />
+   </widget>
+   <widget class="QMenu" name="PopupMenu_2" >
+    <property name="geometry" >
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>800</width>
+      <height>480</height>
+     </rect>
+    </property>
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="helpAboutAction" />
+    <addaction name="helpAboutQtAction" />
+   </widget>
+   <action name="" />
+   <action name="" />
+   <action name="" />
+   <addaction name="PopupMenu" />
+   <addaction name="separator" />
+   <addaction name="PopupMenu_2" />
+  </widget>
+  <action name="fileSaveAction" >
+   <property name="text" >
+    <string>&amp;Save</string>
+   </property>
+   <property name="iconText" >
+    <string>Save</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="fileExitAction" >
+   <property name="text" >
+    <string>E&amp;xit</string>
+   </property>
+   <property name="iconText" >
+    <string>Exit</string>
+   </property>
+   <property name="shortcut" >
+    <string/>
+   </property>
+  </action>
+  <action name="helpAboutAction" >
+   <property name="text" >
+    <string>&amp;About</string>
+   </property>
+   <property name="iconText" >
+    <string>About</string>
+   </property>
+   <property name="shortcut" >
+    <string/>
+   </property>
+  </action>
+  <action name="helpAboutQtAction" >
+   <property name="text" >
+    <string>About &amp;Qt</string>
+   </property>
+   <property name="iconText" >
+    <string>About Qt</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>Q3ListBox</class>
+   <extends></extends>
+   <header>q3listbox.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+  <customwidget>
+   <class>ColorButton</class>
+   <extends></extends>
+   <header>colorbutton.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+  <customwidget>
+   <class>Q3Frame</class>
+   <extends></extends>
+   <header>Qt3Support/Q3Frame</header>
+   <container>1</container>
+   <pixmap></pixmap>
+  </customwidget>
+  <customwidget>
+   <class>PreviewFrame</class>
+   <extends></extends>
+   <header>previewframe.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+  <customwidget>
+   <class>Q3MainWindow</class>
+   <extends></extends>
+   <header>q3mainwindow.h</header>
+   <container>1</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>helpview</tabstop>
+  <tabstop>TabWidget3</tabstop>
+  <tabstop>familycombo</tabstop>
+  <tabstop>stylecombo</tabstop>
+  <tabstop>psizecombo</tabstop>
+  <tabstop>samplelineedit</tabstop>
+  <tabstop>familysubcombo</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>PushButton4</tabstop>
+  <tabstop>choosesubcombo</tabstop>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>dcispin</tabstop>
+  <tabstop>cfispin</tabstop>
+  <tabstop>wslspin</tabstop>
+  <tabstop>effectcheckbox</tabstop>
+  <tabstop>menueffect</tabstop>
+  <tabstop>comboeffect</tabstop>
+  <tabstop>tooltipeffect</tabstop>
+  <tabstop>strutwidth</tabstop>
+  <tabstop>strutheight</tabstop>
+  <tabstop>sublistbox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h
new file mode 100644
index 0000000..3b40a5c
--- /dev/null
+++ b/tests/auto/uic/baseline/mainwindowbase.ui.h
@@ -0,0 +1,968 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'mainwindowbase.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef MAINWINDOWBASE_H
+#define MAINWINDOWBASE_H
+
+#include <Qt3Support/Q3Frame>
+#include <Qt3Support/Q3ListBox>
+#include <Qt3Support/Q3MainWindow>
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTabWidget>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "colorbutton.h"
+#include "previewframe.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWindowBase
+{
+public:
+    QAction *fileSaveAction;
+    QAction *fileExitAction;
+    QAction *helpAboutAction;
+    QAction *helpAboutQtAction;
+    QWidget *widget;
+    QHBoxLayout *hboxLayout;
+    QTextEdit *helpview;
+    QTabWidget *TabWidget3;
+    QWidget *tab1;
+    QVBoxLayout *vboxLayout;
+    QGroupBox *GroupBox40;
+    QHBoxLayout *hboxLayout1;
+    QLabel *gstylebuddy;
+    QComboBox *gstylecombo;
+    QGroupBox *groupAutoPalette;
+    QHBoxLayout *hboxLayout2;
+    QLabel *labelMainColor;
+    ColorButton *buttonMainColor;
+    QLabel *labelMainColor2;
+    ColorButton *buttonMainColor2;
+    QSpacerItem *spacerItem;
+    QPushButton *btnAdvanced;
+    QGroupBox *GroupBox126;
+    QGridLayout *gridLayout;
+    QLabel *TextLabel1;
+    QComboBox *paletteCombo;
+    PreviewFrame *previewFrame;
+    QWidget *tab2;
+    QVBoxLayout *vboxLayout1;
+    QGroupBox *GroupBox1;
+    QGridLayout *gridLayout1;
+    QComboBox *stylecombo;
+    QComboBox *familycombo;
+    QComboBox *psizecombo;
+    QLabel *stylebuddy;
+    QLabel *psizebuddy;
+    QLabel *familybuddy;
+    QLineEdit *samplelineedit;
+    QGroupBox *GroupBox2;
+    QVBoxLayout *vboxLayout2;
+    QHBoxLayout *hboxLayout3;
+    QLabel *famsubbuddy;
+    QComboBox *familysubcombo;
+    QFrame *Line1;
+    QLabel *TextLabel5;
+    Q3ListBox *sublistbox;
+    QHBoxLayout *hboxLayout4;
+    QPushButton *PushButton2;
+    QPushButton *PushButton3;
+    QPushButton *PushButton4;
+    QFrame *Line2;
+    QHBoxLayout *hboxLayout5;
+    QLabel *choosebuddy;
+    QComboBox *choosesubcombo;
+    QPushButton *PushButton1;
+    QWidget *tab;
+    QVBoxLayout *vboxLayout3;
+    QGroupBox *GroupBox4;
+    QGridLayout *gridLayout2;
+    QSpinBox *dcispin;
+    QLabel *dcibuddy;
+    QSpinBox *cfispin;
+    QLabel *cfibuddy;
+    QSpinBox *wslspin;
+    QLabel *wslbuddy;
+    QCheckBox *resolvelinks;
+    QGroupBox *GroupBox3;
+    QVBoxLayout *vboxLayout4;
+    QCheckBox *effectcheckbox;
+    Q3Frame *effectbase;
+    QGridLayout *gridLayout3;
+    QLabel *meffectbuddy;
+    QLabel *ceffectbuddy;
+    QLabel *teffectbuddy;
+    QLabel *beffectbuddy;
+    QComboBox *menueffect;
+    QComboBox *comboeffect;
+    QComboBox *tooltipeffect;
+    QComboBox *toolboxeffect;
+    QGroupBox *GroupBox5;
+    QGridLayout *gridLayout4;
+    QLabel *swbuddy;
+    QLabel *shbuddy;
+    QSpinBox *strutwidth;
+    QSpinBox *strutheight;
+    QCheckBox *rtlExtensions;
+    QLabel *inputStyleLabel;
+    QComboBox *inputStyle;
+    QSpacerItem *spacerItem1;
+    QWidget *tab3;
+    QVBoxLayout *vboxLayout5;
+    QCheckBox *fontembeddingcheckbox;
+    QGroupBox *GroupBox10;
+    QVBoxLayout *vboxLayout6;
+    QGridLayout *gridLayout5;
+    QPushButton *PushButton11;
+    QPushButton *PushButton13;
+    QPushButton *PushButton12;
+    Q3ListBox *fontpathlistbox;
+    QGridLayout *gridLayout6;
+    QSpacerItem *spacerItem2;
+    QPushButton *PushButton15;
+    QPushButton *PushButton14;
+    QLabel *TextLabel15_2;
+    QLineEdit *fontpathlineedit;
+    QMenuBar *menubar;
+    QAction *action;
+    QAction *action1;
+    QAction *action2;
+    QMenu *PopupMenu;
+    QAction *action3;
+    QAction *action4;
+    QAction *action5;
+    QMenu *PopupMenu_2;
+
+    void setupUi(Q3MainWindow *MainWindowBase)
+    {
+        if (MainWindowBase->objectName().isEmpty())
+            MainWindowBase->setObjectName(QString::fromUtf8("MainWindowBase"));
+        MainWindowBase->resize(724, 615);
+        fileSaveAction = new QAction(MainWindowBase);
+        fileSaveAction->setObjectName(QString::fromUtf8("fileSaveAction"));
+        fileExitAction = new QAction(MainWindowBase);
+        fileExitAction->setObjectName(QString::fromUtf8("fileExitAction"));
+        helpAboutAction = new QAction(MainWindowBase);
+        helpAboutAction->setObjectName(QString::fromUtf8("helpAboutAction"));
+        helpAboutQtAction = new QAction(MainWindowBase);
+        helpAboutQtAction->setObjectName(QString::fromUtf8("helpAboutQtAction"));
+        widget = new QWidget(MainWindowBase);
+        widget->setObjectName(QString::fromUtf8("widget"));
+        widget->setGeometry(QRect(0, 28, 724, 587));
+        hboxLayout = new QHBoxLayout(widget);
+        hboxLayout->setSpacing(4);
+        hboxLayout->setMargin(8);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
+        helpview = new QTextEdit(widget);
+        helpview->setObjectName(QString::fromUtf8("helpview"));
+        helpview->setMinimumSize(QSize(200, 0));
+        helpview->setReadOnly(true);
+
+        hboxLayout->addWidget(helpview);
+
+        TabWidget3 = new QTabWidget(widget);
+        TabWidget3->setObjectName(QString::fromUtf8("TabWidget3"));
+        tab1 = new QWidget();
+        tab1->setObjectName(QString::fromUtf8("tab1"));
+        vboxLayout = new QVBoxLayout(tab1);
+        vboxLayout->setSpacing(4);
+        vboxLayout->setMargin(4);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        GroupBox40 = new QGroupBox(tab1);
+        GroupBox40->setObjectName(QString::fromUtf8("GroupBox40"));
+        hboxLayout1 = new QHBoxLayout(GroupBox40);
+        hboxLayout1->setSpacing(4);
+        hboxLayout1->setMargin(8);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        gstylebuddy = new QLabel(GroupBox40);
+        gstylebuddy->setObjectName(QString::fromUtf8("gstylebuddy"));
+
+        hboxLayout1->addWidget(gstylebuddy);
+
+        gstylecombo = new QComboBox(GroupBox40);
+        gstylecombo->setObjectName(QString::fromUtf8("gstylecombo"));
+
+        hboxLayout1->addWidget(gstylecombo);
+
+
+        vboxLayout->addWidget(GroupBox40);
+
+        groupAutoPalette = new QGroupBox(tab1);
+        groupAutoPalette->setObjectName(QString::fromUtf8("groupAutoPalette"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(4));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(groupAutoPalette->sizePolicy().hasHeightForWidth());
+        groupAutoPalette->setSizePolicy(sizePolicy);
+        hboxLayout2 = new QHBoxLayout(groupAutoPalette);
+        hboxLayout2->setSpacing(4);
+        hboxLayout2->setMargin(8);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        labelMainColor = new QLabel(groupAutoPalette);
+        labelMainColor->setObjectName(QString::fromUtf8("labelMainColor"));
+
+        hboxLayout2->addWidget(labelMainColor);
+
+        buttonMainColor = new ColorButton(groupAutoPalette);
+        buttonMainColor->setObjectName(QString::fromUtf8("buttonMainColor"));
+
+        hboxLayout2->addWidget(buttonMainColor);
+
+        labelMainColor2 = new QLabel(groupAutoPalette);
+        labelMainColor2->setObjectName(QString::fromUtf8("labelMainColor2"));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(1));
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(labelMainColor2->sizePolicy().hasHeightForWidth());
+        labelMainColor2->setSizePolicy(sizePolicy1);
+        labelMainColor2->setMinimumSize(QSize(50, 0));
+        labelMainColor2->setLineWidth(1);
+        labelMainColor2->setMidLineWidth(0);
+        labelMainColor2->setAlignment(Qt::AlignVCenter);
+        labelMainColor2->setMargin(0);
+
+        hboxLayout2->addWidget(labelMainColor2);
+
+        buttonMainColor2 = new ColorButton(groupAutoPalette);
+        buttonMainColor2->setObjectName(QString::fromUtf8("buttonMainColor2"));
+
+        hboxLayout2->addWidget(buttonMainColor2);
+
+        spacerItem = new QSpacerItem(70, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout2->addItem(spacerItem);
+
+        btnAdvanced = new QPushButton(groupAutoPalette);
+        btnAdvanced->setObjectName(QString::fromUtf8("btnAdvanced"));
+
+        hboxLayout2->addWidget(btnAdvanced);
+
+
+        vboxLayout->addWidget(groupAutoPalette);
+
+        GroupBox126 = new QGroupBox(tab1);
+        GroupBox126->setObjectName(QString::fromUtf8("GroupBox126"));
+        QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(7));
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(GroupBox126->sizePolicy().hasHeightForWidth());
+        GroupBox126->setSizePolicy(sizePolicy2);
+        gridLayout = new QGridLayout(GroupBox126);
+        gridLayout->setSpacing(4);
+        gridLayout->setMargin(8);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        TextLabel1 = new QLabel(GroupBox126);
+        TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+
+        gridLayout->addWidget(TextLabel1, 0, 0, 1, 1);
+
+        paletteCombo = new QComboBox(GroupBox126);
+        paletteCombo->setObjectName(QString::fromUtf8("paletteCombo"));
+
+        gridLayout->addWidget(paletteCombo, 0, 1, 1, 1);
+
+        previewFrame = new PreviewFrame(GroupBox126);
+        previewFrame->setObjectName(QString::fromUtf8("previewFrame"));
+        QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+        sizePolicy3.setHorizontalStretch(0);
+        sizePolicy3.setVerticalStretch(0);
+        sizePolicy3.setHeightForWidth(previewFrame->sizePolicy().hasHeightForWidth());
+        previewFrame->setSizePolicy(sizePolicy3);
+        previewFrame->setMinimumSize(QSize(410, 260));
+
+        gridLayout->addWidget(previewFrame, 1, 0, 1, 2);
+
+
+        vboxLayout->addWidget(GroupBox126);
+
+        TabWidget3->addTab(tab1, QString());
+        tab2 = new QWidget();
+        tab2->setObjectName(QString::fromUtf8("tab2"));
+        vboxLayout1 = new QVBoxLayout(tab2);
+        vboxLayout1->setSpacing(4);
+        vboxLayout1->setMargin(8);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        GroupBox1 = new QGroupBox(tab2);
+        GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+        gridLayout1 = new QGridLayout(GroupBox1);
+        gridLayout1->setSpacing(4);
+        gridLayout1->setMargin(8);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        stylecombo = new QComboBox(GroupBox1);
+        stylecombo->setObjectName(QString::fromUtf8("stylecombo"));
+        stylecombo->setAutoCompletion(true);
+        stylecombo->setDuplicatesEnabled(false);
+
+        gridLayout1->addWidget(stylecombo, 1, 1, 1, 1);
+
+        familycombo = new QComboBox(GroupBox1);
+        familycombo->setObjectName(QString::fromUtf8("familycombo"));
+        familycombo->setAutoCompletion(true);
+        familycombo->setDuplicatesEnabled(false);
+
+        gridLayout1->addWidget(familycombo, 0, 1, 1, 1);
+
+        psizecombo = new QComboBox(GroupBox1);
+        psizecombo->setObjectName(QString::fromUtf8("psizecombo"));
+        psizecombo->setEditable(true);
+        psizecombo->setAutoCompletion(true);
+        psizecombo->setDuplicatesEnabled(false);
+
+        gridLayout1->addWidget(psizecombo, 2, 1, 1, 1);
+
+        stylebuddy = new QLabel(GroupBox1);
+        stylebuddy->setObjectName(QString::fromUtf8("stylebuddy"));
+
+        gridLayout1->addWidget(stylebuddy, 1, 0, 1, 1);
+
+        psizebuddy = new QLabel(GroupBox1);
+        psizebuddy->setObjectName(QString::fromUtf8("psizebuddy"));
+
+        gridLayout1->addWidget(psizebuddy, 2, 0, 1, 1);
+
+        familybuddy = new QLabel(GroupBox1);
+        familybuddy->setObjectName(QString::fromUtf8("familybuddy"));
+
+        gridLayout1->addWidget(familybuddy, 0, 0, 1, 1);
+
+        samplelineedit = new QLineEdit(GroupBox1);
+        samplelineedit->setObjectName(QString::fromUtf8("samplelineedit"));
+        samplelineedit->setAlignment(Qt::AlignHCenter);
+
+        gridLayout1->addWidget(samplelineedit, 3, 0, 1, 2);
+
+
+        vboxLayout1->addWidget(GroupBox1);
+
+        GroupBox2 = new QGroupBox(tab2);
+        GroupBox2->setObjectName(QString::fromUtf8("GroupBox2"));
+        vboxLayout2 = new QVBoxLayout(GroupBox2);
+        vboxLayout2->setSpacing(4);
+        vboxLayout2->setMargin(8);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        hboxLayout3 = new QHBoxLayout();
+        hboxLayout3->setSpacing(4);
+#ifndef Q_OS_MAC
+        hboxLayout3->setMargin(0);
+#endif
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        famsubbuddy = new QLabel(GroupBox2);
+        famsubbuddy->setObjectName(QString::fromUtf8("famsubbuddy"));
+
+        hboxLayout3->addWidget(famsubbuddy);
+
+        familysubcombo = new QComboBox(GroupBox2);
+        familysubcombo->setObjectName(QString::fromUtf8("familysubcombo"));
+        familysubcombo->setEditable(true);
+        familysubcombo->setAutoCompletion(true);
+        familysubcombo->setDuplicatesEnabled(false);
+
+        hboxLayout3->addWidget(familysubcombo);
+
+
+        vboxLayout2->addLayout(hboxLayout3);
+
+        Line1 = new QFrame(GroupBox2);
+        Line1->setObjectName(QString::fromUtf8("Line1"));
+        Line1->setFrameShape(QFrame::HLine);
+        Line1->setFrameShadow(QFrame::Sunken);
+        Line1->setFrameShape(QFrame::HLine);
+
+        vboxLayout2->addWidget(Line1);
+
+        TextLabel5 = new QLabel(GroupBox2);
+        TextLabel5->setObjectName(QString::fromUtf8("TextLabel5"));
+
+        vboxLayout2->addWidget(TextLabel5);
+
+        sublistbox = new Q3ListBox(GroupBox2);
+        sublistbox->setObjectName(QString::fromUtf8("sublistbox"));
+
+        vboxLayout2->addWidget(sublistbox);
+
+        hboxLayout4 = new QHBoxLayout();
+        hboxLayout4->setSpacing(4);
+        hboxLayout4->setMargin(0);
+        hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
+        PushButton2 = new QPushButton(GroupBox2);
+        PushButton2->setObjectName(QString::fromUtf8("PushButton2"));
+
+        hboxLayout4->addWidget(PushButton2);
+
+        PushButton3 = new QPushButton(GroupBox2);
+        PushButton3->setObjectName(QString::fromUtf8("PushButton3"));
+
+        hboxLayout4->addWidget(PushButton3);
+
+        PushButton4 = new QPushButton(GroupBox2);
+        PushButton4->setObjectName(QString::fromUtf8("PushButton4"));
+
+        hboxLayout4->addWidget(PushButton4);
+
+
+        vboxLayout2->addLayout(hboxLayout4);
+
+        Line2 = new QFrame(GroupBox2);
+        Line2->setObjectName(QString::fromUtf8("Line2"));
+        Line2->setFrameShape(QFrame::HLine);
+        Line2->setFrameShadow(QFrame::Sunken);
+        Line2->setFrameShape(QFrame::HLine);
+
+        vboxLayout2->addWidget(Line2);
+
+        hboxLayout5 = new QHBoxLayout();
+        hboxLayout5->setSpacing(4);
+        hboxLayout5->setMargin(0);
+        hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
+        choosebuddy = new QLabel(GroupBox2);
+        choosebuddy->setObjectName(QString::fromUtf8("choosebuddy"));
+
+        hboxLayout5->addWidget(choosebuddy);
+
+        choosesubcombo = new QComboBox(GroupBox2);
+        choosesubcombo->setObjectName(QString::fromUtf8("choosesubcombo"));
+        choosesubcombo->setAutoCompletion(true);
+        choosesubcombo->setDuplicatesEnabled(false);
+
+        hboxLayout5->addWidget(choosesubcombo);
+
+        PushButton1 = new QPushButton(GroupBox2);
+        PushButton1->setObjectName(QString::fromUtf8("PushButton1"));
+
+        hboxLayout5->addWidget(PushButton1);
+
+
+        vboxLayout2->addLayout(hboxLayout5);
+
+
+        vboxLayout1->addWidget(GroupBox2);
+
+        TabWidget3->addTab(tab2, QString());
+        tab = new QWidget();
+        tab->setObjectName(QString::fromUtf8("tab"));
+        vboxLayout3 = new QVBoxLayout(tab);
+        vboxLayout3->setSpacing(4);
+        vboxLayout3->setMargin(7);
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        GroupBox4 = new QGroupBox(tab);
+        GroupBox4->setObjectName(QString::fromUtf8("GroupBox4"));
+        gridLayout2 = new QGridLayout(GroupBox4);
+        gridLayout2->setSpacing(4);
+        gridLayout2->setMargin(8);
+        gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+        dcispin = new QSpinBox(GroupBox4);
+        dcispin->setObjectName(QString::fromUtf8("dcispin"));
+        dcispin->setMaximum(10000);
+        dcispin->setMinimum(10);
+
+        gridLayout2->addWidget(dcispin, 0, 1, 1, 1);
+
+        dcibuddy = new QLabel(GroupBox4);
+        dcibuddy->setObjectName(QString::fromUtf8("dcibuddy"));
+
+        gridLayout2->addWidget(dcibuddy, 0, 0, 1, 1);
+
+        cfispin = new QSpinBox(GroupBox4);
+        cfispin->setObjectName(QString::fromUtf8("cfispin"));
+        cfispin->setMaximum(10000);
+        cfispin->setMinimum(9);
+
+        gridLayout2->addWidget(cfispin, 1, 1, 1, 1);
+
+        cfibuddy = new QLabel(GroupBox4);
+        cfibuddy->setObjectName(QString::fromUtf8("cfibuddy"));
+
+        gridLayout2->addWidget(cfibuddy, 1, 0, 1, 1);
+
+        wslspin = new QSpinBox(GroupBox4);
+        wslspin->setObjectName(QString::fromUtf8("wslspin"));
+        wslspin->setMaximum(20);
+        wslspin->setMinimum(1);
+
+        gridLayout2->addWidget(wslspin, 2, 1, 1, 1);
+
+        wslbuddy = new QLabel(GroupBox4);
+        wslbuddy->setObjectName(QString::fromUtf8("wslbuddy"));
+
+        gridLayout2->addWidget(wslbuddy, 2, 0, 1, 1);
+
+        resolvelinks = new QCheckBox(GroupBox4);
+        resolvelinks->setObjectName(QString::fromUtf8("resolvelinks"));
+
+        gridLayout2->addWidget(resolvelinks, 3, 0, 1, 2);
+
+
+        vboxLayout3->addWidget(GroupBox4);
+
+        GroupBox3 = new QGroupBox(tab);
+        GroupBox3->setObjectName(QString::fromUtf8("GroupBox3"));
+        vboxLayout4 = new QVBoxLayout(GroupBox3);
+        vboxLayout4->setSpacing(4);
+        vboxLayout4->setMargin(8);
+        vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
+        effectcheckbox = new QCheckBox(GroupBox3);
+        effectcheckbox->setObjectName(QString::fromUtf8("effectcheckbox"));
+
+        vboxLayout4->addWidget(effectcheckbox);
+
+        effectbase = new Q3Frame(GroupBox3);
+        effectbase->setObjectName(QString::fromUtf8("effectbase"));
+        effectbase->setFrameShape(QFrame::NoFrame);
+        effectbase->setFrameShadow(QFrame::Plain);
+        gridLayout3 = new QGridLayout(effectbase);
+        gridLayout3->setSpacing(4);
+        gridLayout3->setMargin(0);
+        gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+        meffectbuddy = new QLabel(effectbase);
+        meffectbuddy->setObjectName(QString::fromUtf8("meffectbuddy"));
+
+        gridLayout3->addWidget(meffectbuddy, 0, 0, 1, 1);
+
+        ceffectbuddy = new QLabel(effectbase);
+        ceffectbuddy->setObjectName(QString::fromUtf8("ceffectbuddy"));
+
+        gridLayout3->addWidget(ceffectbuddy, 1, 0, 1, 1);
+
+        teffectbuddy = new QLabel(effectbase);
+        teffectbuddy->setObjectName(QString::fromUtf8("teffectbuddy"));
+
+        gridLayout3->addWidget(teffectbuddy, 2, 0, 1, 1);
+
+        beffectbuddy = new QLabel(effectbase);
+        beffectbuddy->setObjectName(QString::fromUtf8("beffectbuddy"));
+
+        gridLayout3->addWidget(beffectbuddy, 3, 0, 1, 1);
+
+        menueffect = new QComboBox(effectbase);
+        menueffect->setObjectName(QString::fromUtf8("menueffect"));
+        menueffect->setAutoCompletion(true);
+
+        gridLayout3->addWidget(menueffect, 0, 1, 1, 1);
+
+        comboeffect = new QComboBox(effectbase);
+        comboeffect->setObjectName(QString::fromUtf8("comboeffect"));
+
+        gridLayout3->addWidget(comboeffect, 1, 1, 1, 1);
+
+        tooltipeffect = new QComboBox(effectbase);
+        tooltipeffect->setObjectName(QString::fromUtf8("tooltipeffect"));
+
+        gridLayout3->addWidget(tooltipeffect, 2, 1, 1, 1);
+
+        toolboxeffect = new QComboBox(effectbase);
+        toolboxeffect->setObjectName(QString::fromUtf8("toolboxeffect"));
+
+        gridLayout3->addWidget(toolboxeffect, 3, 1, 1, 1);
+
+
+        vboxLayout4->addWidget(effectbase);
+
+
+        vboxLayout3->addWidget(GroupBox3);
+
+        GroupBox5 = new QGroupBox(tab);
+        GroupBox5->setObjectName(QString::fromUtf8("GroupBox5"));
+        gridLayout4 = new QGridLayout(GroupBox5);
+        gridLayout4->setSpacing(4);
+        gridLayout4->setMargin(8);
+        gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+        swbuddy = new QLabel(GroupBox5);
+        swbuddy->setObjectName(QString::fromUtf8("swbuddy"));
+
+        gridLayout4->addWidget(swbuddy, 0, 0, 1, 1);
+
+        shbuddy = new QLabel(GroupBox5);
+        shbuddy->setObjectName(QString::fromUtf8("shbuddy"));
+
+        gridLayout4->addWidget(shbuddy, 1, 0, 1, 1);
+
+        strutwidth = new QSpinBox(GroupBox5);
+        strutwidth->setObjectName(QString::fromUtf8("strutwidth"));
+        strutwidth->setMaximum(1000);
+
+        gridLayout4->addWidget(strutwidth, 0, 1, 1, 1);
+
+        strutheight = new QSpinBox(GroupBox5);
+        strutheight->setObjectName(QString::fromUtf8("strutheight"));
+        strutheight->setMaximum(1000);
+
+        gridLayout4->addWidget(strutheight, 1, 1, 1, 1);
+
+
+        vboxLayout3->addWidget(GroupBox5);
+
+        rtlExtensions = new QCheckBox(tab);
+        rtlExtensions->setObjectName(QString::fromUtf8("rtlExtensions"));
+
+        vboxLayout3->addWidget(rtlExtensions);
+
+        inputStyleLabel = new QLabel(tab);
+        inputStyleLabel->setObjectName(QString::fromUtf8("inputStyleLabel"));
+
+        vboxLayout3->addWidget(inputStyleLabel);
+
+        inputStyle = new QComboBox(tab);
+        inputStyle->setObjectName(QString::fromUtf8("inputStyle"));
+
+        vboxLayout3->addWidget(inputStyle);
+
+        spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout3->addItem(spacerItem1);
+
+        TabWidget3->addTab(tab, QString());
+        tab3 = new QWidget();
+        tab3->setObjectName(QString::fromUtf8("tab3"));
+        vboxLayout5 = new QVBoxLayout(tab3);
+        vboxLayout5->setSpacing(4);
+        vboxLayout5->setMargin(8);
+        vboxLayout5->setObjectName(QString::fromUtf8("vboxLayout5"));
+        fontembeddingcheckbox = new QCheckBox(tab3);
+        fontembeddingcheckbox->setObjectName(QString::fromUtf8("fontembeddingcheckbox"));
+        fontembeddingcheckbox->setChecked(true);
+
+        vboxLayout5->addWidget(fontembeddingcheckbox);
+
+        GroupBox10 = new QGroupBox(tab3);
+        GroupBox10->setObjectName(QString::fromUtf8("GroupBox10"));
+        sizePolicy2.setHeightForWidth(GroupBox10->sizePolicy().hasHeightForWidth());
+        GroupBox10->setSizePolicy(sizePolicy2);
+        vboxLayout6 = new QVBoxLayout(GroupBox10);
+        vboxLayout6->setSpacing(4);
+        vboxLayout6->setMargin(8);
+        vboxLayout6->setObjectName(QString::fromUtf8("vboxLayout6"));
+        gridLayout5 = new QGridLayout();
+        gridLayout5->setSpacing(4);
+#ifndef Q_OS_MAC
+        gridLayout5->setMargin(0);
+#endif
+        gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+        PushButton11 = new QPushButton(GroupBox10);
+        PushButton11->setObjectName(QString::fromUtf8("PushButton11"));
+
+        gridLayout5->addWidget(PushButton11, 1, 0, 1, 1);
+
+        PushButton13 = new QPushButton(GroupBox10);
+        PushButton13->setObjectName(QString::fromUtf8("PushButton13"));
+
+        gridLayout5->addWidget(PushButton13, 1, 2, 1, 1);
+
+        PushButton12 = new QPushButton(GroupBox10);
+        PushButton12->setObjectName(QString::fromUtf8("PushButton12"));
+
+        gridLayout5->addWidget(PushButton12, 1, 1, 1, 1);
+
+        fontpathlistbox = new Q3ListBox(GroupBox10);
+        fontpathlistbox->setObjectName(QString::fromUtf8("fontpathlistbox"));
+
+        gridLayout5->addWidget(fontpathlistbox, 0, 0, 1, 3);
+
+
+        vboxLayout6->addLayout(gridLayout5);
+
+        gridLayout6 = new QGridLayout();
+        gridLayout6->setSpacing(4);
+        gridLayout6->setMargin(0);
+        gridLayout6->setObjectName(QString::fromUtf8("gridLayout6"));
+        spacerItem2 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum);
+
+        gridLayout6->addItem(spacerItem2, 2, 0, 1, 1);
+
+        PushButton15 = new QPushButton(GroupBox10);
+        PushButton15->setObjectName(QString::fromUtf8("PushButton15"));
+
+        gridLayout6->addWidget(PushButton15, 2, 2, 1, 1);
+
+        PushButton14 = new QPushButton(GroupBox10);
+        PushButton14->setObjectName(QString::fromUtf8("PushButton14"));
+
+        gridLayout6->addWidget(PushButton14, 2, 1, 1, 1);
+
+        TextLabel15_2 = new QLabel(GroupBox10);
+        TextLabel15_2->setObjectName(QString::fromUtf8("TextLabel15_2"));
+
+        gridLayout6->addWidget(TextLabel15_2, 0, 0, 1, 3);
+
+        fontpathlineedit = new QLineEdit(GroupBox10);
+        fontpathlineedit->setObjectName(QString::fromUtf8("fontpathlineedit"));
+
+        gridLayout6->addWidget(fontpathlineedit, 1, 0, 1, 3);
+
+
+        vboxLayout6->addLayout(gridLayout6);
+
+
+        vboxLayout5->addWidget(GroupBox10);
+
+        TabWidget3->addTab(tab3, QString());
+
+        hboxLayout->addWidget(TabWidget3);
+
+        MainWindowBase->setCentralWidget(widget);
+        menubar = new QMenuBar(MainWindowBase);
+        menubar->setObjectName(QString::fromUtf8("menubar"));
+        menubar->setGeometry(QRect(0, 0, 724, 27));
+        action = new QAction(menubar);
+        action->setObjectName(QString::fromUtf8("action"));
+        action1 = new QAction(menubar);
+        action1->setObjectName(QString::fromUtf8("action1"));
+        action2 = new QAction(menubar);
+        action2->setObjectName(QString::fromUtf8("action2"));
+        PopupMenu = new QMenu(menubar);
+        PopupMenu->setObjectName(QString::fromUtf8("PopupMenu"));
+        PopupMenu->setGeometry(QRect(0, 0, 800, 480));
+        action3 = new QAction(PopupMenu);
+        action3->setObjectName(QString::fromUtf8("action3"));
+        action4 = new QAction(PopupMenu);
+        action4->setObjectName(QString::fromUtf8("action4"));
+        action5 = new QAction(PopupMenu);
+        action5->setObjectName(QString::fromUtf8("action5"));
+        PopupMenu_2 = new QMenu(menubar);
+        PopupMenu_2->setObjectName(QString::fromUtf8("PopupMenu_2"));
+        PopupMenu_2->setGeometry(QRect(0, 0, 800, 480));
+#ifndef QT_NO_SHORTCUT
+        gstylebuddy->setBuddy(gstylecombo);
+        labelMainColor->setBuddy(buttonMainColor);
+        labelMainColor2->setBuddy(buttonMainColor2);
+        TextLabel1->setBuddy(paletteCombo);
+        stylebuddy->setBuddy(stylecombo);
+        psizebuddy->setBuddy(psizecombo);
+        familybuddy->setBuddy(familycombo);
+        famsubbuddy->setBuddy(familysubcombo);
+        choosebuddy->setBuddy(choosesubcombo);
+        dcibuddy->setBuddy(dcispin);
+        cfibuddy->setBuddy(cfispin);
+        wslbuddy->setBuddy(wslspin);
+        meffectbuddy->setBuddy(menueffect);
+        ceffectbuddy->setBuddy(comboeffect);
+        teffectbuddy->setBuddy(tooltipeffect);
+        beffectbuddy->setBuddy(toolboxeffect);
+        swbuddy->setBuddy(strutwidth);
+        shbuddy->setBuddy(strutheight);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(helpview, TabWidget3);
+        QWidget::setTabOrder(TabWidget3, familycombo);
+        QWidget::setTabOrder(familycombo, stylecombo);
+        QWidget::setTabOrder(stylecombo, psizecombo);
+        QWidget::setTabOrder(psizecombo, samplelineedit);
+        QWidget::setTabOrder(samplelineedit, familysubcombo);
+        QWidget::setTabOrder(familysubcombo, PushButton2);
+        QWidget::setTabOrder(PushButton2, PushButton3);
+        QWidget::setTabOrder(PushButton3, PushButton4);
+        QWidget::setTabOrder(PushButton4, choosesubcombo);
+        QWidget::setTabOrder(choosesubcombo, PushButton1);
+        QWidget::setTabOrder(PushButton1, dcispin);
+        QWidget::setTabOrder(dcispin, cfispin);
+        QWidget::setTabOrder(cfispin, wslspin);
+        QWidget::setTabOrder(wslspin, effectcheckbox);
+        QWidget::setTabOrder(effectcheckbox, menueffect);
+        QWidget::setTabOrder(menueffect, comboeffect);
+        QWidget::setTabOrder(comboeffect, tooltipeffect);
+        QWidget::setTabOrder(tooltipeffect, strutwidth);
+        QWidget::setTabOrder(strutwidth, strutheight);
+        QWidget::setTabOrder(strutheight, sublistbox);
+
+        menubar->addAction(PopupMenu->menuAction());
+        menubar->addSeparator();
+        menubar->addAction(PopupMenu_2->menuAction());
+        PopupMenu->addAction(fileSaveAction);
+        PopupMenu->addSeparator();
+        PopupMenu->addAction(fileExitAction);
+        PopupMenu_2->addAction(helpAboutAction);
+        PopupMenu_2->addAction(helpAboutQtAction);
+
+        retranslateUi(MainWindowBase);
+
+        menueffect->setCurrentIndex(0);
+        inputStyle->setCurrentIndex(0);
+
+
+        QMetaObject::connectSlotsByName(MainWindowBase);
+    } // setupUi
+
+    void retranslateUi(Q3MainWindow *MainWindowBase)
+    {
+        MainWindowBase->setWindowTitle(QApplication::translate("MainWindowBase", "Qt Configuration", 0, QApplication::UnicodeUTF8));
+        fileSaveAction->setText(QApplication::translate("MainWindowBase", "&Save", 0, QApplication::UnicodeUTF8));
+        fileSaveAction->setIconText(QApplication::translate("MainWindowBase", "Save", 0, QApplication::UnicodeUTF8));
+        fileSaveAction->setShortcut(QApplication::translate("MainWindowBase", "Ctrl+S", 0, QApplication::UnicodeUTF8));
+        fileExitAction->setText(QApplication::translate("MainWindowBase", "E&xit", 0, QApplication::UnicodeUTF8));
+        fileExitAction->setIconText(QApplication::translate("MainWindowBase", "Exit", 0, QApplication::UnicodeUTF8));
+        fileExitAction->setShortcut(QString());
+        helpAboutAction->setText(QApplication::translate("MainWindowBase", "&About", 0, QApplication::UnicodeUTF8));
+        helpAboutAction->setIconText(QApplication::translate("MainWindowBase", "About", 0, QApplication::UnicodeUTF8));
+        helpAboutAction->setShortcut(QString());
+        helpAboutQtAction->setText(QApplication::translate("MainWindowBase", "About &Qt", 0, QApplication::UnicodeUTF8));
+        helpAboutQtAction->setIconText(QApplication::translate("MainWindowBase", "About Qt", 0, QApplication::UnicodeUTF8));
+        GroupBox40->setTitle(QApplication::translate("MainWindowBase", "GUI Style", 0, QApplication::UnicodeUTF8));
+        gstylebuddy->setText(QApplication::translate("MainWindowBase", "Select GUI &Style:", 0, QApplication::UnicodeUTF8));
+        groupAutoPalette->setTitle(QApplication::translate("MainWindowBase", "Build Palette", 0, QApplication::UnicodeUTF8));
+        labelMainColor->setText(QApplication::translate("MainWindowBase", "&3-D Effects:", 0, QApplication::UnicodeUTF8));
+        labelMainColor2->setText(QApplication::translate("MainWindowBase", "Window Back&ground:", 0, QApplication::UnicodeUTF8));
+        btnAdvanced->setText(QApplication::translate("MainWindowBase", "&Tune Palette...", 0, QApplication::UnicodeUTF8));
+        GroupBox126->setTitle(QApplication::translate("MainWindowBase", "Preview", 0, QApplication::UnicodeUTF8));
+        TextLabel1->setText(QApplication::translate("MainWindowBase", "Select &Palette:", 0, QApplication::UnicodeUTF8));
+        paletteCombo->clear();
+        paletteCombo->insertItems(0, QStringList()
+         << QApplication::translate("MainWindowBase", "Active Palette", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Inactive Palette", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Disabled Palette", 0, QApplication::UnicodeUTF8)
+        );
+        TabWidget3->setTabText(TabWidget3->indexOf(tab1), QApplication::translate("MainWindowBase", "Appearance", 0, QApplication::UnicodeUTF8));
+        GroupBox1->setTitle(QApplication::translate("MainWindowBase", "Default Font", 0, QApplication::UnicodeUTF8));
+        stylebuddy->setText(QApplication::translate("MainWindowBase", "&Style:", 0, QApplication::UnicodeUTF8));
+        psizebuddy->setText(QApplication::translate("MainWindowBase", "&Point Size:", 0, QApplication::UnicodeUTF8));
+        familybuddy->setText(QApplication::translate("MainWindowBase", "F&amily:", 0, QApplication::UnicodeUTF8));
+        samplelineedit->setText(QApplication::translate("MainWindowBase", "Sample Text", 0, QApplication::UnicodeUTF8));
+        GroupBox2->setTitle(QApplication::translate("MainWindowBase", "Font Substitution", 0, QApplication::UnicodeUTF8));
+        famsubbuddy->setText(QApplication::translate("MainWindowBase", "S&elect or Enter a Family:", 0, QApplication::UnicodeUTF8));
+        TextLabel5->setText(QApplication::translate("MainWindowBase", "Current Substitutions:", 0, QApplication::UnicodeUTF8));
+        PushButton2->setText(QApplication::translate("MainWindowBase", "Up", 0, QApplication::UnicodeUTF8));
+        PushButton3->setText(QApplication::translate("MainWindowBase", "Down", 0, QApplication::UnicodeUTF8));
+        PushButton4->setText(QApplication::translate("MainWindowBase", "Remove", 0, QApplication::UnicodeUTF8));
+        choosebuddy->setText(QApplication::translate("MainWindowBase", "Select s&ubstitute Family:", 0, QApplication::UnicodeUTF8));
+        PushButton1->setText(QApplication::translate("MainWindowBase", "Add", 0, QApplication::UnicodeUTF8));
+        TabWidget3->setTabText(TabWidget3->indexOf(tab2), QApplication::translate("MainWindowBase", "Fonts", 0, QApplication::UnicodeUTF8));
+        GroupBox4->setTitle(QApplication::translate("MainWindowBase", "Feel Settings", 0, QApplication::UnicodeUTF8));
+        dcispin->setSuffix(QApplication::translate("MainWindowBase", " ms", 0, QApplication::UnicodeUTF8));
+        dcibuddy->setText(QApplication::translate("MainWindowBase", "&Double Click Interval:", 0, QApplication::UnicodeUTF8));
+        cfispin->setSpecialValueText(QApplication::translate("MainWindowBase", "No blinking", 0, QApplication::UnicodeUTF8));
+        cfispin->setSuffix(QApplication::translate("MainWindowBase", " ms", 0, QApplication::UnicodeUTF8));
+        cfibuddy->setText(QApplication::translate("MainWindowBase", "&Cursor Flash Time:", 0, QApplication::UnicodeUTF8));
+        wslspin->setSuffix(QApplication::translate("MainWindowBase", " lines", 0, QApplication::UnicodeUTF8));
+        wslbuddy->setText(QApplication::translate("MainWindowBase", "Wheel &Scroll Lines:", 0, QApplication::UnicodeUTF8));
+        resolvelinks->setText(QApplication::translate("MainWindowBase", "Resolve symlinks in URLs", 0, QApplication::UnicodeUTF8));
+        GroupBox3->setTitle(QApplication::translate("MainWindowBase", "GUI Effects", 0, QApplication::UnicodeUTF8));
+        effectcheckbox->setText(QApplication::translate("MainWindowBase", "&Enable", 0, QApplication::UnicodeUTF8));
+        effectcheckbox->setShortcut(QApplication::translate("MainWindowBase", "Alt+E", 0, QApplication::UnicodeUTF8));
+        meffectbuddy->setText(QApplication::translate("MainWindowBase", "&Menu Effect:", 0, QApplication::UnicodeUTF8));
+        ceffectbuddy->setText(QApplication::translate("MainWindowBase", "C&omboBox Effect:", 0, QApplication::UnicodeUTF8));
+        teffectbuddy->setText(QApplication::translate("MainWindowBase", "&ToolTip Effect:", 0, QApplication::UnicodeUTF8));
+        beffectbuddy->setText(QApplication::translate("MainWindowBase", "Tool&Box Effect:", 0, QApplication::UnicodeUTF8));
+        menueffect->clear();
+        menueffect->insertItems(0, QStringList()
+         << QApplication::translate("MainWindowBase", "Disable", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Animate", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Fade", 0, QApplication::UnicodeUTF8)
+        );
+        comboeffect->clear();
+        comboeffect->insertItems(0, QStringList()
+         << QApplication::translate("MainWindowBase", "Disable", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Animate", 0, QApplication::UnicodeUTF8)
+        );
+        tooltipeffect->clear();
+        tooltipeffect->insertItems(0, QStringList()
+         << QApplication::translate("MainWindowBase", "Disable", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Animate", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Fade", 0, QApplication::UnicodeUTF8)
+        );
+        toolboxeffect->clear();
+        toolboxeffect->insertItems(0, QStringList()
+         << QApplication::translate("MainWindowBase", "Disable", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Animate", 0, QApplication::UnicodeUTF8)
+        );
+        GroupBox5->setTitle(QApplication::translate("MainWindowBase", "Global Strut", 0, QApplication::UnicodeUTF8));
+        swbuddy->setText(QApplication::translate("MainWindowBase", "Minimum &Width:", 0, QApplication::UnicodeUTF8));
+        shbuddy->setText(QApplication::translate("MainWindowBase", "Minimum Hei&ght:", 0, QApplication::UnicodeUTF8));
+        strutwidth->setSuffix(QApplication::translate("MainWindowBase", " pixels", 0, QApplication::UnicodeUTF8));
+        strutheight->setSuffix(QApplication::translate("MainWindowBase", " pixels", 0, QApplication::UnicodeUTF8));
+        rtlExtensions->setText(QApplication::translate("MainWindowBase", "Enhanced support for languages written right-to-left", 0, QApplication::UnicodeUTF8));
+        inputStyleLabel->setText(QApplication::translate("MainWindowBase", "XIM Input Style:", 0, QApplication::UnicodeUTF8));
+        inputStyle->clear();
+        inputStyle->insertItems(0, QStringList()
+         << QApplication::translate("MainWindowBase", "On The Spot", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Over The Spot", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Off The Spot", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindowBase", "Root", 0, QApplication::UnicodeUTF8)
+        );
+        TabWidget3->setTabText(TabWidget3->indexOf(tab), QApplication::translate("MainWindowBase", "Interface", 0, QApplication::UnicodeUTF8));
+        fontembeddingcheckbox->setText(QApplication::translate("MainWindowBase", "Enable Font embedding", 0, QApplication::UnicodeUTF8));
+        GroupBox10->setTitle(QApplication::translate("MainWindowBase", "Font Paths", 0, QApplication::UnicodeUTF8));
+        PushButton11->setText(QApplication::translate("MainWindowBase", "Up", 0, QApplication::UnicodeUTF8));
+        PushButton13->setText(QApplication::translate("MainWindowBase", "Remove", 0, QApplication::UnicodeUTF8));
+        PushButton12->setText(QApplication::translate("MainWindowBase", "Down", 0, QApplication::UnicodeUTF8));
+        PushButton15->setText(QApplication::translate("MainWindowBase", "Add", 0, QApplication::UnicodeUTF8));
+        PushButton14->setText(QApplication::translate("MainWindowBase", "Browse...", 0, QApplication::UnicodeUTF8));
+        TextLabel15_2->setText(QApplication::translate("MainWindowBase", "Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list.", 0, QApplication::UnicodeUTF8));
+        TabWidget3->setTabText(TabWidget3->indexOf(tab3), QApplication::translate("MainWindowBase", "Printer", 0, QApplication::UnicodeUTF8));
+        PopupMenu->setTitle(QApplication::translate("MainWindowBase", "&File", 0, QApplication::UnicodeUTF8));
+        PopupMenu_2->setTitle(QApplication::translate("MainWindowBase", "&Help", 0, QApplication::UnicodeUTF8));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class MainWindowBase: public Ui_MainWindowBase {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // MAINWINDOWBASE_H
diff --git a/tests/auto/uic/baseline/mydialog.ui b/tests/auto/uic/baseline/mydialog.ui
new file mode 100644
index 0000000..d765b30
--- /dev/null
+++ b/tests/auto/uic/baseline/mydialog.ui
@@ -0,0 +1,47 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MyDialog</class>
+ <widget class="QDialog" name="MyDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>401</width>
+    <height>70</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Mach 2!</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="aLabel" >
+     <property name="text" >
+      <string>Join the life in the fastlane; - PCH enable your project today! -</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="aButton" >
+     <property name="text" >
+      <string>&amp;Quit</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+Q</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/mydialog.ui.h b/tests/auto/uic/baseline/mydialog.ui.h
new file mode 100644
index 0000000..12228c0
--- /dev/null
+++ b/tests/auto/uic/baseline/mydialog.ui.h
@@ -0,0 +1,79 @@
+/********************************************************************************
+** Form generated from reading ui file 'mydialog.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef MYDIALOG_H
+#define MYDIALOG_H
+
+#include <Qt3Support/Q3MimeSourceFactory>
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_MyDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QLabel *aLabel;
+    QPushButton *aButton;
+
+    void setupUi(QDialog *MyDialog)
+    {
+        if (MyDialog->objectName().isEmpty())
+            MyDialog->setObjectName(QString::fromUtf8("MyDialog"));
+        MyDialog->resize(401, 70);
+        vboxLayout = new QVBoxLayout(MyDialog);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        aLabel = new QLabel(MyDialog);
+        aLabel->setObjectName(QString::fromUtf8("aLabel"));
+
+        vboxLayout->addWidget(aLabel);
+
+        aButton = new QPushButton(MyDialog);
+        aButton->setObjectName(QString::fromUtf8("aButton"));
+
+        vboxLayout->addWidget(aButton);
+
+
+        retranslateUi(MyDialog);
+
+        QMetaObject::connectSlotsByName(MyDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *MyDialog)
+    {
+        MyDialog->setWindowTitle(QApplication::translate("MyDialog", "Mach 2!", 0, QApplication::UnicodeUTF8));
+        aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", 0, QApplication::UnicodeUTF8));
+        aButton->setText(QApplication::translate("MyDialog", "&Quit", 0, QApplication::UnicodeUTF8));
+        aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(MyDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class MyDialog: public Ui_MyDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // MYDIALOG_H
diff --git a/tests/auto/uic/baseline/myform.ui b/tests/auto/uic/baseline/myform.ui
new file mode 100644
index 0000000..00702e8
--- /dev/null
+++ b/tests/auto/uic/baseline/myform.ui
@@ -0,0 +1,130 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>258</width>
+    <height>224</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Export Document</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Export Options</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" >
+       <widget class="QRadioButton" name="radioButton_2" >
+        <property name="text" >
+         <string>&amp;DocBook</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="radioButton" >
+        <property name="text" >
+         <string>&amp;LaTeX</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QCheckBox" name="checkBox_2" >
+        <property name="text" >
+         <string>Include p&amp;ictures</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QCheckBox" name="checkBox" >
+        <property name="text" >
+         <string>&amp;Compress</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="radioButton_2_2" >
+        <property name="text" >
+         <string>&amp;HTML</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QRadioButton" name="radioButton_3" >
+        <property name="text" >
+         <string>&amp;PostScript</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QRadioButton" name="radioButton_4" >
+        <property name="text" >
+         <string>PD&amp;F</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QCheckBox" name="checkBox_3" >
+        <property name="text" >
+         <string>Include &amp;metadata</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QCheckBox" name="checkBox_4" >
+        <property name="text" >
+         <string>Create inde&amp;x</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/myform.ui.h b/tests/auto/uic/baseline/myform.ui.h
new file mode 100644
index 0000000..9aaa709
--- /dev/null
+++ b/tests/auto/uic/baseline/myform.ui.h
@@ -0,0 +1,149 @@
+/********************************************************************************
+** Form generated from reading ui file 'myform.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef MYFORM_H
+#define MYFORM_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Form
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout;
+    QRadioButton *radioButton_2;
+    QRadioButton *radioButton;
+    QCheckBox *checkBox_2;
+    QSpacerItem *spacerItem;
+    QCheckBox *checkBox;
+    QRadioButton *radioButton_2_2;
+    QRadioButton *radioButton_3;
+    QRadioButton *radioButton_4;
+    QCheckBox *checkBox_3;
+    QCheckBox *checkBox_4;
+
+    void setupUi(QWidget *Form)
+    {
+        if (Form->objectName().isEmpty())
+            Form->setObjectName(QString::fromUtf8("Form"));
+        Form->resize(258, 224);
+        vboxLayout = new QVBoxLayout(Form);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(8);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(Form);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        gridLayout = new QGridLayout(groupBox);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+        gridLayout->setMargin(8);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        radioButton_2 = new QRadioButton(groupBox);
+        radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
+
+        gridLayout->addWidget(radioButton_2, 1, 0, 1, 1);
+
+        radioButton = new QRadioButton(groupBox);
+        radioButton->setObjectName(QString::fromUtf8("radioButton"));
+        radioButton->setChecked(true);
+
+        gridLayout->addWidget(radioButton, 0, 0, 1, 1);
+
+        checkBox_2 = new QCheckBox(groupBox);
+        checkBox_2->setObjectName(QString::fromUtf8("checkBox_2"));
+        checkBox_2->setChecked(true);
+
+        gridLayout->addWidget(checkBox_2, 1, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem, 5, 0, 1, 1);
+
+        checkBox = new QCheckBox(groupBox);
+        checkBox->setObjectName(QString::fromUtf8("checkBox"));
+
+        gridLayout->addWidget(checkBox, 0, 1, 1, 1);
+
+        radioButton_2_2 = new QRadioButton(groupBox);
+        radioButton_2_2->setObjectName(QString::fromUtf8("radioButton_2_2"));
+
+        gridLayout->addWidget(radioButton_2_2, 2, 0, 1, 1);
+
+        radioButton_3 = new QRadioButton(groupBox);
+        radioButton_3->setObjectName(QString::fromUtf8("radioButton_3"));
+
+        gridLayout->addWidget(radioButton_3, 3, 0, 1, 1);
+
+        radioButton_4 = new QRadioButton(groupBox);
+        radioButton_4->setObjectName(QString::fromUtf8("radioButton_4"));
+
+        gridLayout->addWidget(radioButton_4, 4, 0, 1, 1);
+
+        checkBox_3 = new QCheckBox(groupBox);
+        checkBox_3->setObjectName(QString::fromUtf8("checkBox_3"));
+
+        gridLayout->addWidget(checkBox_3, 2, 1, 1, 1);
+
+        checkBox_4 = new QCheckBox(groupBox);
+        checkBox_4->setObjectName(QString::fromUtf8("checkBox_4"));
+        checkBox_4->setChecked(true);
+
+        gridLayout->addWidget(checkBox_4, 3, 1, 1, 1);
+
+
+        vboxLayout->addWidget(groupBox);
+
+
+        retranslateUi(Form);
+
+        QMetaObject::connectSlotsByName(Form);
+    } // setupUi
+
+    void retranslateUi(QWidget *Form)
+    {
+        Form->setWindowTitle(QApplication::translate("Form", "Export Document", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("Form", "Export Options", 0, QApplication::UnicodeUTF8));
+        radioButton_2->setText(QApplication::translate("Form", "&DocBook", 0, QApplication::UnicodeUTF8));
+        radioButton->setText(QApplication::translate("Form", "&LaTeX", 0, QApplication::UnicodeUTF8));
+        checkBox_2->setText(QApplication::translate("Form", "Include p&ictures", 0, QApplication::UnicodeUTF8));
+        checkBox->setText(QApplication::translate("Form", "&Compress", 0, QApplication::UnicodeUTF8));
+        radioButton_2_2->setText(QApplication::translate("Form", "&HTML", 0, QApplication::UnicodeUTF8));
+        radioButton_3->setText(QApplication::translate("Form", "&PostScript", 0, QApplication::UnicodeUTF8));
+        radioButton_4->setText(QApplication::translate("Form", "PD&F", 0, QApplication::UnicodeUTF8));
+        checkBox_3->setText(QApplication::translate("Form", "Include &metadata", 0, QApplication::UnicodeUTF8));
+        checkBox_4->setText(QApplication::translate("Form", "Create inde&x", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Form);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Form: public Ui_Form {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // MYFORM_H
diff --git a/tests/auto/uic/baseline/newactiondialog.ui b/tests/auto/uic/baseline/newactiondialog.ui
new file mode 100644
index 0000000..ec073c1
--- /dev/null
+++ b/tests/auto/uic/baseline/newactiondialog.ui
@@ -0,0 +1,201 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::NewActionDialog</class>
+ <widget class="QDialog" name="qdesigner_internal::NewActionDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>363</width>
+    <height>156</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>New Action...</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <layout class="QFormLayout" name="formLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>&amp;Text:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>editActionText</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="editActionText" >
+       <property name="minimumSize" >
+        <size>
+         <width>255</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="label_3" >
+       <property name="text" >
+        <string>Object &amp;name:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>editObjectName</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QLineEdit" name="editObjectName" />
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>&amp;Icon:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>iconSelector</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <layout class="QHBoxLayout" name="horizontalLayout" >
+       <item>
+        <widget class="qdesigner_internal::IconSelector" native="1" name="iconSelector" />
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qdesigner_internal::IconSelector</class>
+   <extends>QWidget</extends>
+   <header>iconselector_p.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>editActionText</tabstop>
+  <tabstop>editObjectName</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qdesigner_internal::NewActionDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>165</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>291</x>
+     <y>94</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qdesigner_internal::NewActionDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>259</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>293</x>
+     <y>128</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/newactiondialog.ui.h b/tests/auto/uic/baseline/newactiondialog.ui.h
new file mode 100644
index 0000000..69f13fd
--- /dev/null
+++ b/tests/auto/uic/baseline/newactiondialog.ui.h
@@ -0,0 +1,197 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'newactiondialog.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef NEWACTIONDIALOG_H
+#define NEWACTIONDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QFrame>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+#include "iconselector_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_NewActionDialog
+{
+public:
+    QVBoxLayout *verticalLayout;
+    QFormLayout *formLayout;
+    QLabel *label;
+    QLineEdit *editActionText;
+    QLabel *label_3;
+    QLineEdit *editObjectName;
+    QLabel *label_2;
+    QHBoxLayout *horizontalLayout;
+    qdesigner_internal::IconSelector *iconSelector;
+    QSpacerItem *spacerItem;
+    QSpacerItem *verticalSpacer;
+    QFrame *line;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *qdesigner_internal__NewActionDialog)
+    {
+        if (qdesigner_internal__NewActionDialog->objectName().isEmpty())
+            qdesigner_internal__NewActionDialog->setObjectName(QString::fromUtf8("qdesigner_internal__NewActionDialog"));
+        qdesigner_internal__NewActionDialog->resize(363, 156);
+        verticalLayout = new QVBoxLayout(qdesigner_internal__NewActionDialog);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        formLayout = new QFormLayout();
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
+        label = new QLabel(qdesigner_internal__NewActionDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+
+        editActionText = new QLineEdit(qdesigner_internal__NewActionDialog);
+        editActionText->setObjectName(QString::fromUtf8("editActionText"));
+        editActionText->setMinimumSize(QSize(255, 0));
+
+        formLayout->setWidget(0, QFormLayout::FieldRole, editActionText);
+
+        label_3 = new QLabel(qdesigner_internal__NewActionDialog);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        formLayout->setWidget(1, QFormLayout::LabelRole, label_3);
+
+        editObjectName = new QLineEdit(qdesigner_internal__NewActionDialog);
+        editObjectName->setObjectName(QString::fromUtf8("editObjectName"));
+
+        formLayout->setWidget(1, QFormLayout::FieldRole, editObjectName);
+
+        label_2 = new QLabel(qdesigner_internal__NewActionDialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        formLayout->setWidget(2, QFormLayout::LabelRole, label_2);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        iconSelector = new qdesigner_internal::IconSelector(qdesigner_internal__NewActionDialog);
+        iconSelector->setObjectName(QString::fromUtf8("iconSelector"));
+
+        horizontalLayout->addWidget(iconSelector);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(spacerItem);
+
+
+        formLayout->setLayout(2, QFormLayout::FieldRole, horizontalLayout);
+
+
+        verticalLayout->addLayout(formLayout);
+
+        verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout->addItem(verticalSpacer);
+
+        line = new QFrame(qdesigner_internal__NewActionDialog);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        verticalLayout->addWidget(line);
+
+        buttonBox = new QDialogButtonBox(qdesigner_internal__NewActionDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        verticalLayout->addWidget(buttonBox);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(editActionText);
+        label_3->setBuddy(editObjectName);
+        label_2->setBuddy(iconSelector);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(editActionText, editObjectName);
+
+        retranslateUi(qdesigner_internal__NewActionDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__NewActionDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__NewActionDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__NewActionDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__NewActionDialog)
+    {
+        qdesigner_internal__NewActionDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewActionDialog", "New Action...", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Text:", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "Object &name:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Icon:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__NewActionDialog);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class NewActionDialog: public Ui_NewActionDialog {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // NEWACTIONDIALOG_H
diff --git a/tests/auto/uic/baseline/newdynamicpropertydialog.ui b/tests/auto/uic/baseline/newdynamicpropertydialog.ui
new file mode 100644
index 0000000..2aa91f3
--- /dev/null
+++ b/tests/auto/uic/baseline/newdynamicpropertydialog.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>qdesigner_internal::NewDynamicPropertyDialog</class>
+ <widget class="QDialog" name="qdesigner_internal::NewDynamicPropertyDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>340</width>
+    <height>118</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Create Dynamic Property</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <layout class="QFormLayout" name="formLayout" >
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="m_lineEdit" >
+       <property name="minimumSize" >
+        <size>
+         <width>220</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Property Name</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <layout class="QHBoxLayout" name="horizontalLayout" >
+       <item>
+        <widget class="QComboBox" name="m_comboBox" />
+       </item>
+       <item>
+        <spacer name="horizontalSpacer" >
+         <property name="spacerName" stdset="0" >
+          <string>horizontalSpacer</string>
+         </property>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Property Type</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="spacerName" stdset="0" >
+      <string/>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="m_buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
new file mode 100644
index 0000000..69f1ed5
--- /dev/null
+++ b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
@@ -0,0 +1,133 @@
+/********************************************************************************
+** Form generated from reading ui file 'newdynamicpropertydialog.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef NEWDYNAMICPROPERTYDIALOG_H
+#define NEWDYNAMICPROPERTYDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_NewDynamicPropertyDialog
+{
+public:
+    QVBoxLayout *verticalLayout;
+    QFormLayout *formLayout;
+    QLineEdit *m_lineEdit;
+    QLabel *label;
+    QHBoxLayout *horizontalLayout;
+    QComboBox *m_comboBox;
+    QSpacerItem *horizontalSpacer;
+    QLabel *label_2;
+    QSpacerItem *spacerItem;
+    QDialogButtonBox *m_buttonBox;
+
+    void setupUi(QDialog *qdesigner_internal__NewDynamicPropertyDialog)
+    {
+        if (qdesigner_internal__NewDynamicPropertyDialog->objectName().isEmpty())
+            qdesigner_internal__NewDynamicPropertyDialog->setObjectName(QString::fromUtf8("qdesigner_internal__NewDynamicPropertyDialog"));
+        qdesigner_internal__NewDynamicPropertyDialog->resize(340, 118);
+        verticalLayout = new QVBoxLayout(qdesigner_internal__NewDynamicPropertyDialog);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        formLayout = new QFormLayout();
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
+        m_lineEdit = new QLineEdit(qdesigner_internal__NewDynamicPropertyDialog);
+        m_lineEdit->setObjectName(QString::fromUtf8("m_lineEdit"));
+        m_lineEdit->setMinimumSize(QSize(220, 0));
+
+        formLayout->setWidget(0, QFormLayout::FieldRole, m_lineEdit);
+
+        label = new QLabel(qdesigner_internal__NewDynamicPropertyDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy);
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        m_comboBox = new QComboBox(qdesigner_internal__NewDynamicPropertyDialog);
+        m_comboBox->setObjectName(QString::fromUtf8("m_comboBox"));
+
+        horizontalLayout->addWidget(m_comboBox);
+
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(horizontalSpacer);
+
+
+        formLayout->setLayout(1, QFormLayout::FieldRole, horizontalLayout);
+
+        label_2 = new QLabel(qdesigner_internal__NewDynamicPropertyDialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        sizePolicy.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
+        label_2->setSizePolicy(sizePolicy);
+
+        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+
+
+        verticalLayout->addLayout(formLayout);
+
+        spacerItem = new QSpacerItem(QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout->addItem(spacerItem);
+
+        m_buttonBox = new QDialogButtonBox(qdesigner_internal__NewDynamicPropertyDialog);
+        m_buttonBox->setObjectName(QString::fromUtf8("m_buttonBox"));
+        m_buttonBox->setOrientation(Qt::Horizontal);
+        m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+        m_buttonBox->setCenterButtons(false);
+
+        verticalLayout->addWidget(m_buttonBox);
+
+
+        retranslateUi(qdesigner_internal__NewDynamicPropertyDialog);
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__NewDynamicPropertyDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__NewDynamicPropertyDialog)
+    {
+        qdesigner_internal__NewDynamicPropertyDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Create Dynamic Property", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Name", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("qdesigner_internal::NewDynamicPropertyDialog", "Property Type", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__NewDynamicPropertyDialog);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class NewDynamicPropertyDialog: public Ui_NewDynamicPropertyDialog {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // NEWDYNAMICPROPERTYDIALOG_H
diff --git a/tests/auto/uic/baseline/newform.ui b/tests/auto/uic/baseline/newform.ui
new file mode 100644
index 0000000..4d26151
--- /dev/null
+++ b/tests/auto/uic/baseline/newform.ui
@@ -0,0 +1,152 @@
+<ui version="4.0" >
+ <author></author>
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <exportmacro></exportmacro>
+ <class>NewForm</class>
+ <widget class="QDialog" name="NewForm" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>495</width>
+    <height>319</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>New Form</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QTreeWidget" name="treeWidget" >
+       <property name="iconSize" >
+        <size>
+         <width>128</width>
+         <height>128</height>
+        </size>
+       </property>
+       <property name="rootIsDecorated" >
+        <bool>false</bool>
+       </property>
+       <property name="columnCount" >
+        <number>1</number>
+       </property>
+       <column>
+        <property name="text" >
+         <string>0</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblPreview" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>5</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="lineWidth" >
+        <number>1</number>
+       </property>
+       <property name="text" >
+        <string>Choose a template for a preview</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="margin" >
+        <number>5</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QFrame" name="horizontalLine" >
+     <property name="frameShape" >
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Sunken</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="chkShowOnStartup" >
+     <property name="text" >
+      <string>Show this Dialog on Startup</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" />
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>QDialogButtonBox</class>
+   <extends>QWidget</extends>
+   <header>qdialogbuttonbox.h</header>
+   <container>1</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/uic/baseline/newform.ui.h
new file mode 100644
index 0000000..46af9cb
--- /dev/null
+++ b/tests/auto/uic/baseline/newform.ui.h
@@ -0,0 +1,166 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'newform.ui'
+**
+** Created: Mon Jun 16 17:56:52 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef NEWFORM_H
+#define NEWFORM_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_NewForm
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QTreeWidget *treeWidget;
+    QLabel *lblPreview;
+    QFrame *horizontalLine;
+    QCheckBox *chkShowOnStartup;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *NewForm)
+    {
+        if (NewForm->objectName().isEmpty())
+            NewForm->setObjectName(QString::fromUtf8("NewForm"));
+        NewForm->resize(495, 319);
+        vboxLayout = new QVBoxLayout(NewForm);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(1);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        treeWidget = new QTreeWidget(NewForm);
+        treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
+        treeWidget->setIconSize(QSize(128, 128));
+        treeWidget->setRootIsDecorated(false);
+        treeWidget->setColumnCount(1);
+
+        hboxLayout->addWidget(treeWidget);
+
+        lblPreview = new QLabel(NewForm);
+        lblPreview->setObjectName(QString::fromUtf8("lblPreview"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(5));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(lblPreview->sizePolicy().hasHeightForWidth());
+        lblPreview->setSizePolicy(sizePolicy);
+        lblPreview->setLineWidth(1);
+        lblPreview->setAlignment(Qt::AlignCenter);
+        lblPreview->setMargin(5);
+
+        hboxLayout->addWidget(lblPreview);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        horizontalLine = new QFrame(NewForm);
+        horizontalLine->setObjectName(QString::fromUtf8("horizontalLine"));
+        horizontalLine->setFrameShape(QFrame::HLine);
+        horizontalLine->setFrameShadow(QFrame::Sunken);
+
+        vboxLayout->addWidget(horizontalLine);
+
+        chkShowOnStartup = new QCheckBox(NewForm);
+        chkShowOnStartup->setObjectName(QString::fromUtf8("chkShowOnStartup"));
+
+        vboxLayout->addWidget(chkShowOnStartup);
+
+        buttonBox = new QDialogButtonBox(NewForm);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(NewForm);
+
+        QMetaObject::connectSlotsByName(NewForm);
+    } // setupUi
+
+    void retranslateUi(QDialog *NewForm)
+    {
+        NewForm->setWindowTitle(QApplication::translate("NewForm", "New Form", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("NewForm", "0", 0, QApplication::UnicodeUTF8));
+        lblPreview->setText(QApplication::translate("NewForm", "Choose a template for a preview", 0, QApplication::UnicodeUTF8));
+        chkShowOnStartup->setText(QApplication::translate("NewForm", "Show this Dialog on Startup", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(NewForm);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class NewForm: public Ui_NewForm {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // NEWFORM_H
diff --git a/tests/auto/uic/baseline/orderdialog.ui b/tests/auto/uic/baseline/orderdialog.ui
new file mode 100644
index 0000000..83caa3d
--- /dev/null
+++ b/tests/auto/uic/baseline/orderdialog.ui
@@ -0,0 +1,197 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::OrderDialog</class>
+ <widget class="QDialog" name="qdesigner_internal::OrderDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>467</width>
+    <height>310</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Change Page Order</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Page Order</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <item>
+       <widget class="QListWidget" name="pageList" >
+        <property name="minimumSize" >
+         <size>
+          <width>344</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="dragDropMode" >
+         <enum>QAbstractItemView::InternalMove</enum>
+        </property>
+        <property name="selectionMode" >
+         <enum>QAbstractItemView::ContiguousSelection</enum>
+        </property>
+        <property name="movement" >
+         <enum>QListView::Snap</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" >
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QToolButton" name="upButton" >
+          <property name="toolTip" >
+           <string>Move page up</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="downButton" >
+          <property name="toolTip" >
+           <string>Move page down</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>20</width>
+            <height>99</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qdesigner_internal::OrderDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>50</x>
+     <y>163</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>6</x>
+     <y>151</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qdesigner_internal::OrderDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>300</x>
+     <y>160</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>348</x>
+     <y>148</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/orderdialog.ui.h b/tests/auto/uic/baseline/orderdialog.ui.h
new file mode 100644
index 0000000..7460475
--- /dev/null
+++ b/tests/auto/uic/baseline/orderdialog.ui.h
@@ -0,0 +1,172 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'orderdialog.ui'
+**
+** Created: Mon Jun 16 17:55:54 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef ORDERDIALOG_H
+#define ORDERDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_OrderDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QHBoxLayout *hboxLayout;
+    QListWidget *pageList;
+    QVBoxLayout *vboxLayout1;
+    QToolButton *upButton;
+    QToolButton *downButton;
+    QSpacerItem *spacerItem;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *qdesigner_internal__OrderDialog)
+    {
+        if (qdesigner_internal__OrderDialog->objectName().isEmpty())
+            qdesigner_internal__OrderDialog->setObjectName(QString::fromUtf8("qdesigner_internal__OrderDialog"));
+        qdesigner_internal__OrderDialog->resize(467, 310);
+        vboxLayout = new QVBoxLayout(qdesigner_internal__OrderDialog);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(qdesigner_internal__OrderDialog);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        hboxLayout = new QHBoxLayout(groupBox);
+        hboxLayout->setSpacing(6);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setContentsMargins(9, 9, 9, 9);
+        pageList = new QListWidget(groupBox);
+        pageList->setObjectName(QString::fromUtf8("pageList"));
+        pageList->setMinimumSize(QSize(344, 0));
+        pageList->setDragDropMode(QAbstractItemView::InternalMove);
+        pageList->setSelectionMode(QAbstractItemView::ContiguousSelection);
+        pageList->setMovement(QListView::Snap);
+
+        hboxLayout->addWidget(pageList);
+
+        vboxLayout1 = new QVBoxLayout();
+        vboxLayout1->setSpacing(6);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
+        upButton = new QToolButton(groupBox);
+        upButton->setObjectName(QString::fromUtf8("upButton"));
+
+        vboxLayout1->addWidget(upButton);
+
+        downButton = new QToolButton(groupBox);
+        downButton->setObjectName(QString::fromUtf8("downButton"));
+
+        vboxLayout1->addWidget(downButton);
+
+        spacerItem = new QSpacerItem(20, 99, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout1->addItem(spacerItem);
+
+
+        hboxLayout->addLayout(vboxLayout1);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        buttonBox = new QDialogButtonBox(qdesigner_internal__OrderDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(qdesigner_internal__OrderDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__OrderDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__OrderDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__OrderDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__OrderDialog)
+    {
+        qdesigner_internal__OrderDialog->setWindowTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Change Page Order", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Page Order", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        upButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        Q_UNUSED(qdesigner_internal__OrderDialog);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class OrderDialog: public Ui_OrderDialog {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // ORDERDIALOG_H
diff --git a/tests/auto/uic/baseline/outputpage.ui b/tests/auto/uic/baseline/outputpage.ui
new file mode 100644
index 0000000..755f818
--- /dev/null
+++ b/tests/auto/uic/baseline/outputpage.ui
@@ -0,0 +1,95 @@
+<ui version="4.0" >
+ <class>OutputPage</class>
+ <widget class="QWidget" name="OutputPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>242</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Project file name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="projectLineEdit" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Collection file name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="collectionLineEdit" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/outputpage.ui.h b/tests/auto/uic/baseline/outputpage.ui.h
new file mode 100644
index 0000000..8199c57
--- /dev/null
+++ b/tests/auto/uic/baseline/outputpage.ui.h
@@ -0,0 +1,108 @@
+/********************************************************************************
+** Form generated from reading ui file 'outputpage.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef OUTPUTPAGE_H
+#define OUTPUTPAGE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_OutputPage
+{
+public:
+    QGridLayout *gridLayout;
+    QSpacerItem *spacerItem;
+    QLabel *label;
+    QLineEdit *projectLineEdit;
+    QLabel *label_2;
+    QLineEdit *collectionLineEdit;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QWidget *OutputPage)
+    {
+        if (OutputPage->objectName().isEmpty())
+            OutputPage->setObjectName(QString::fromUtf8("OutputPage"));
+        OutputPage->resize(417, 242);
+        gridLayout = new QGridLayout(OutputPage);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem, 0, 1, 1, 1);
+
+        label = new QLabel(OutputPage);
+        label->setObjectName(QString::fromUtf8("label"));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(label, 1, 0, 1, 1);
+
+        projectLineEdit = new QLineEdit(OutputPage);
+        projectLineEdit->setObjectName(QString::fromUtf8("projectLineEdit"));
+        QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(projectLineEdit->sizePolicy().hasHeightForWidth());
+        projectLineEdit->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(projectLineEdit, 1, 1, 1, 1);
+
+        label_2 = new QLabel(OutputPage);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        sizePolicy.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
+        label_2->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(label_2, 2, 0, 1, 1);
+
+        collectionLineEdit = new QLineEdit(OutputPage);
+        collectionLineEdit->setObjectName(QString::fromUtf8("collectionLineEdit"));
+        sizePolicy1.setHeightForWidth(collectionLineEdit->sizePolicy().hasHeightForWidth());
+        collectionLineEdit->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(collectionLineEdit, 2, 1, 1, 1);
+
+        spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem1, 3, 1, 1, 1);
+
+
+        retranslateUi(OutputPage);
+
+        QMetaObject::connectSlotsByName(OutputPage);
+    } // setupUi
+
+    void retranslateUi(QWidget *OutputPage)
+    {
+        OutputPage->setWindowTitle(QApplication::translate("OutputPage", "Form", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("OutputPage", "Project file name:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("OutputPage", "Collection file name:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(OutputPage);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class OutputPage: public Ui_OutputPage {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // OUTPUTPAGE_H
diff --git a/tests/auto/uic/baseline/pagefold.ui b/tests/auto/uic/baseline/pagefold.ui
new file mode 100644
index 0000000..7ae313c
--- /dev/null
+++ b/tests/auto/uic/baseline/pagefold.ui
@@ -0,0 +1,349 @@
+<ui version="4.0" >
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>392</width>
+    <height>412</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QFrame" name="mainFrame" >
+      <property name="frameShape" >
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow" >
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item row="0" column="1" colspan="3" >
+        <widget class="QComboBox" name="nameCombo" >
+         <property name="toolTip" >
+          <string>Specify your name</string>
+         </property>
+         <property name="editable" >
+          <bool>true</bool>
+         </property>
+         <property name="currentIndex" >
+          <number>-1</number>
+         </property>
+         <item>
+          <property name="text" >
+           <string>Girish</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Jasmin</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Simon</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Zack</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="1" column="3" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QRadioButton" name="femaleRadioButton" >
+         <property name="styleSheet" >
+          <string>Check this if you are female</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Female</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="genderLabel" >
+         <property name="text" >
+          <string>Gender:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="ageLabel" >
+         <property name="text" >
+          <string>&amp;Age:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>ageSpinBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QRadioButton" name="maleRadioButton" >
+         <property name="toolTip" >
+          <string>Check this if you are male</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Male</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="nameLabel" >
+         <property name="text" >
+          <string>&amp;Name:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>nameCombo</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" >
+        <widget class="QLabel" name="passwordLabel" >
+         <property name="text" >
+          <string>&amp;Password:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>passwordEdit</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="3" >
+        <widget class="QSpinBox" name="ageSpinBox" >
+         <property name="toolTip" >
+          <string>Specify your age</string>
+         </property>
+         <property name="statusTip" >
+          <string>Specify your age</string>
+         </property>
+         <property name="minimum" >
+          <number>12</number>
+         </property>
+         <property name="value" >
+          <number>22</number>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="2" colspan="2" >
+        <widget class="QDialogButtonBox" name="buttonBox" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons" >
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="4" >
+        <widget class="QCheckBox" name="agreeCheckBox" >
+         <property name="toolTip" >
+          <string>Please read the LICENSE file before checking</string>
+         </property>
+         <property name="text" >
+          <string>I &amp;accept the terms and &amp;conditions</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" colspan="3" >
+        <widget class="QLineEdit" name="passwordEdit" >
+         <property name="toolTip" >
+          <string>Specify your password</string>
+         </property>
+         <property name="statusTip" >
+          <string>Specify your password</string>
+         </property>
+         <property name="text" >
+          <string>Password</string>
+         </property>
+         <property name="echoMode" >
+          <enum>QLineEdit::Password</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1" colspan="3" >
+        <widget class="QListWidget" name="professionList" >
+         <property name="toolTip" >
+          <string>Select your profession</string>
+         </property>
+         <property name="statusTip" >
+          <string>Specify your name here</string>
+         </property>
+         <property name="whatsThis" >
+          <string>Specify your name here</string>
+         </property>
+         <property name="currentRow" >
+          <number>0</number>
+         </property>
+         <item>
+          <property name="text" >
+           <string>Developer</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Student</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Fisherman</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="5" column="0" >
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Profession:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>professionList</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1" colspan="3" >
+        <widget class="QComboBox" name="countryCombo" >
+         <property name="toolTip" >
+          <string>Specify country of origin</string>
+         </property>
+         <property name="statusTip" >
+          <string>Specify country of origin</string>
+         </property>
+         <property name="currentIndex" >
+          <number>6</number>
+         </property>
+         <item>
+          <property name="text" >
+           <string>Egypt</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>France</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Germany</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>India</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Italy</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Korea</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Norway</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="4" column="0" >
+        <widget class="QLabel" name="countryLabel" >
+         <property name="text" >
+          <string>Pro&amp;fession</string>
+         </property>
+         <property name="buddy" >
+          <cstring>professionList</cstring>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>392</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_File" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <addaction name="editStyleAction" />
+    <addaction name="separator" />
+    <addaction name="exitAction" />
+   </widget>
+   <widget class="QMenu" name="menu_Help" >
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="aboutAction" />
+    <addaction name="separator" />
+    <addaction name="aboutQtAction" />
+   </widget>
+   <addaction name="menu_File" />
+   <addaction name="menu_Help" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <action name="exitAction" >
+   <property name="text" >
+    <string>&amp;Exit</string>
+   </property>
+  </action>
+  <action name="aboutQtAction" >
+   <property name="text" >
+    <string>About Qt</string>
+   </property>
+  </action>
+  <action name="editStyleAction" >
+   <property name="text" >
+    <string>Edit &amp;Style</string>
+   </property>
+  </action>
+  <action name="aboutAction" >
+   <property name="text" >
+    <string>About</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/pagefold.ui.h b/tests/auto/uic/baseline/pagefold.ui.h
new file mode 100644
index 0000000..adff3a3
--- /dev/null
+++ b/tests/auto/uic/baseline/pagefold.ui.h
@@ -0,0 +1,329 @@
+/********************************************************************************
+** Form generated from reading ui file 'pagefold.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PAGEFOLD_H
+#define PAGEFOLD_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListWidget>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QStatusBar>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWindow
+{
+public:
+    QAction *exitAction;
+    QAction *aboutQtAction;
+    QAction *editStyleAction;
+    QAction *aboutAction;
+    QWidget *centralwidget;
+    QVBoxLayout *vboxLayout;
+    QFrame *mainFrame;
+    QGridLayout *gridLayout;
+    QComboBox *nameCombo;
+    QSpacerItem *spacerItem;
+    QRadioButton *femaleRadioButton;
+    QLabel *genderLabel;
+    QLabel *ageLabel;
+    QRadioButton *maleRadioButton;
+    QLabel *nameLabel;
+    QLabel *passwordLabel;
+    QSpinBox *ageSpinBox;
+    QDialogButtonBox *buttonBox;
+    QCheckBox *agreeCheckBox;
+    QLineEdit *passwordEdit;
+    QListWidget *professionList;
+    QLabel *label;
+    QComboBox *countryCombo;
+    QLabel *countryLabel;
+    QMenuBar *menubar;
+    QMenu *menu_File;
+    QMenu *menu_Help;
+    QStatusBar *statusbar;
+
+    void setupUi(QMainWindow *MainWindow)
+    {
+        if (MainWindow->objectName().isEmpty())
+            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
+        MainWindow->resize(392, 412);
+        exitAction = new QAction(MainWindow);
+        exitAction->setObjectName(QString::fromUtf8("exitAction"));
+        aboutQtAction = new QAction(MainWindow);
+        aboutQtAction->setObjectName(QString::fromUtf8("aboutQtAction"));
+        editStyleAction = new QAction(MainWindow);
+        editStyleAction->setObjectName(QString::fromUtf8("editStyleAction"));
+        aboutAction = new QAction(MainWindow);
+        aboutAction->setObjectName(QString::fromUtf8("aboutAction"));
+        centralwidget = new QWidget(MainWindow);
+        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
+        vboxLayout = new QVBoxLayout(centralwidget);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        mainFrame = new QFrame(centralwidget);
+        mainFrame->setObjectName(QString::fromUtf8("mainFrame"));
+        mainFrame->setFrameShape(QFrame::StyledPanel);
+        mainFrame->setFrameShadow(QFrame::Raised);
+        gridLayout = new QGridLayout(mainFrame);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        nameCombo = new QComboBox(mainFrame);
+        nameCombo->setObjectName(QString::fromUtf8("nameCombo"));
+        nameCombo->setEditable(true);
+
+        gridLayout->addWidget(nameCombo, 0, 1, 1, 3);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 1, 3, 1, 1);
+
+        femaleRadioButton = new QRadioButton(mainFrame);
+        femaleRadioButton->setObjectName(QString::fromUtf8("femaleRadioButton"));
+
+        gridLayout->addWidget(femaleRadioButton, 1, 2, 1, 1);
+
+        genderLabel = new QLabel(mainFrame);
+        genderLabel->setObjectName(QString::fromUtf8("genderLabel"));
+
+        gridLayout->addWidget(genderLabel, 1, 0, 1, 1);
+
+        ageLabel = new QLabel(mainFrame);
+        ageLabel->setObjectName(QString::fromUtf8("ageLabel"));
+
+        gridLayout->addWidget(ageLabel, 2, 0, 1, 1);
+
+        maleRadioButton = new QRadioButton(mainFrame);
+        maleRadioButton->setObjectName(QString::fromUtf8("maleRadioButton"));
+
+        gridLayout->addWidget(maleRadioButton, 1, 1, 1, 1);
+
+        nameLabel = new QLabel(mainFrame);
+        nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
+
+        gridLayout->addWidget(nameLabel, 0, 0, 1, 1);
+
+        passwordLabel = new QLabel(mainFrame);
+        passwordLabel->setObjectName(QString::fromUtf8("passwordLabel"));
+
+        gridLayout->addWidget(passwordLabel, 3, 0, 1, 1);
+
+        ageSpinBox = new QSpinBox(mainFrame);
+        ageSpinBox->setObjectName(QString::fromUtf8("ageSpinBox"));
+        ageSpinBox->setMinimum(12);
+        ageSpinBox->setValue(22);
+
+        gridLayout->addWidget(ageSpinBox, 2, 1, 1, 3);
+
+        buttonBox = new QDialogButtonBox(mainFrame);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 7, 2, 1, 2);
+
+        agreeCheckBox = new QCheckBox(mainFrame);
+        agreeCheckBox->setObjectName(QString::fromUtf8("agreeCheckBox"));
+
+        gridLayout->addWidget(agreeCheckBox, 6, 0, 1, 4);
+
+        passwordEdit = new QLineEdit(mainFrame);
+        passwordEdit->setObjectName(QString::fromUtf8("passwordEdit"));
+        passwordEdit->setEchoMode(QLineEdit::Password);
+
+        gridLayout->addWidget(passwordEdit, 3, 1, 1, 3);
+
+        professionList = new QListWidget(mainFrame);
+        new QListWidgetItem(professionList);
+        new QListWidgetItem(professionList);
+        new QListWidgetItem(professionList);
+        professionList->setObjectName(QString::fromUtf8("professionList"));
+
+        gridLayout->addWidget(professionList, 5, 1, 1, 3);
+
+        label = new QLabel(mainFrame);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 5, 0, 1, 1);
+
+        countryCombo = new QComboBox(mainFrame);
+        countryCombo->setObjectName(QString::fromUtf8("countryCombo"));
+
+        gridLayout->addWidget(countryCombo, 4, 1, 1, 3);
+
+        countryLabel = new QLabel(mainFrame);
+        countryLabel->setObjectName(QString::fromUtf8("countryLabel"));
+
+        gridLayout->addWidget(countryLabel, 4, 0, 1, 1);
+
+
+        vboxLayout->addWidget(mainFrame);
+
+        MainWindow->setCentralWidget(centralwidget);
+        menubar = new QMenuBar(MainWindow);
+        menubar->setObjectName(QString::fromUtf8("menubar"));
+        menubar->setGeometry(QRect(0, 0, 392, 25));
+        menu_File = new QMenu(menubar);
+        menu_File->setObjectName(QString::fromUtf8("menu_File"));
+        menu_Help = new QMenu(menubar);
+        menu_Help->setObjectName(QString::fromUtf8("menu_Help"));
+        MainWindow->setMenuBar(menubar);
+        statusbar = new QStatusBar(MainWindow);
+        statusbar->setObjectName(QString::fromUtf8("statusbar"));
+        MainWindow->setStatusBar(statusbar);
+#ifndef QT_NO_SHORTCUT
+        ageLabel->setBuddy(ageSpinBox);
+        nameLabel->setBuddy(nameCombo);
+        passwordLabel->setBuddy(passwordEdit);
+        label->setBuddy(professionList);
+        countryLabel->setBuddy(professionList);
+#endif // QT_NO_SHORTCUT
+
+        menubar->addAction(menu_File->menuAction());
+        menubar->addAction(menu_Help->menuAction());
+        menu_File->addAction(editStyleAction);
+        menu_File->addSeparator();
+        menu_File->addAction(exitAction);
+        menu_Help->addAction(aboutAction);
+        menu_Help->addSeparator();
+        menu_Help->addAction(aboutQtAction);
+
+        retranslateUi(MainWindow);
+
+        nameCombo->setCurrentIndex(-1);
+        professionList->setCurrentRow(0);
+        countryCombo->setCurrentIndex(6);
+
+
+        QMetaObject::connectSlotsByName(MainWindow);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *MainWindow)
+    {
+        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+        exitAction->setText(QApplication::translate("MainWindow", "&Exit", 0, QApplication::UnicodeUTF8));
+        aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", 0, QApplication::UnicodeUTF8));
+        editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", 0, QApplication::UnicodeUTF8));
+        aboutAction->setText(QApplication::translate("MainWindow", "About", 0, QApplication::UnicodeUTF8));
+        nameCombo->clear();
+        nameCombo->insertItems(0, QStringList()
+         << QApplication::translate("MainWindow", "Girish", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Jasmin", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Simon", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Zack", 0, QApplication::UnicodeUTF8)
+        );
+#ifndef QT_NO_TOOLTIP
+        nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        femaleRadioButton->setStyleSheet(QApplication::translate("MainWindow", "Check this if you are female", 0, QApplication::UnicodeUTF8));
+        femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", 0, QApplication::UnicodeUTF8));
+        genderLabel->setText(QApplication::translate("MainWindow", "Gender:", 0, QApplication::UnicodeUTF8));
+        ageLabel->setText(QApplication::translate("MainWindow", "&Age:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", 0, QApplication::UnicodeUTF8));
+        nameLabel->setText(QApplication::translate("MainWindow", "&Name:", 0, QApplication::UnicodeUTF8));
+        passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+#ifndef QT_NO_TOOLTIP
+        agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the LICENSE file before checking", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and &conditions", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+        passwordEdit->setText(QApplication::translate("MainWindow", "Password", 0, QApplication::UnicodeUTF8));
+
+        const bool __sortingEnabled = professionList->isSortingEnabled();
+        professionList->setSortingEnabled(false);
+        QListWidgetItem *___qlistwidgetitem = professionList->item(0);
+        ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", 0, QApplication::UnicodeUTF8));
+        QListWidgetItem *___qlistwidgetitem1 = professionList->item(1);
+        ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", 0, QApplication::UnicodeUTF8));
+        QListWidgetItem *___qlistwidgetitem2 = professionList->item(2);
+        ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", 0, QApplication::UnicodeUTF8));
+        professionList->setSortingEnabled(__sortingEnabled);
+
+#ifndef QT_NO_TOOLTIP
+        professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        professionList->setStatusTip(QApplication::translate("MainWindow", "Specify your name here", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+#ifndef QT_NO_WHATSTHIS
+        professionList->setWhatsThis(QApplication::translate("MainWindow", "Specify your name here", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        label->setText(QApplication::translate("MainWindow", "Profession:", 0, QApplication::UnicodeUTF8));
+        countryCombo->clear();
+        countryCombo->insertItems(0, QStringList()
+         << QApplication::translate("MainWindow", "Egypt", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "France", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Germany", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "India", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Italy", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Korea", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "Norway", 0, QApplication::UnicodeUTF8)
+        );
+#ifndef QT_NO_TOOLTIP
+        countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify country of origin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+        countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify country of origin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_STATUSTIP
+        countryLabel->setText(QApplication::translate("MainWindow", "Pro&fession", 0, QApplication::UnicodeUTF8));
+        menu_File->setTitle(QApplication::translate("MainWindow", "&File", 0, QApplication::UnicodeUTF8));
+        menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class MainWindow: public Ui_MainWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PAGEFOLD_H
diff --git a/tests/auto/uic/baseline/paletteeditor.ui b/tests/auto/uic/baseline/paletteeditor.ui
new file mode 100644
index 0000000..def48a1
--- /dev/null
+++ b/tests/auto/uic/baseline/paletteeditor.ui
@@ -0,0 +1,263 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::PaletteEditor</class>
+ <widget class="QDialog" name="qdesigner_internal::PaletteEditor" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>365</width>
+    <height>409</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>7</hsizetype>
+    <vsizetype>7</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Edit Palette</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="advancedBox" >
+     <property name="minimumSize" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Tune Palette</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QtColorButton" name="buildButton" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>13</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="4" >
+       <widget class="QTreeView" name="paletteView" >
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>200</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QRadioButton" name="detailsRadio" >
+        <property name="text" >
+         <string>Show Details</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QRadioButton" name="computeRadio" >
+        <property name="text" >
+         <string>Compute Details</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Quick</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="GroupBox126" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Preview</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="2" >
+       <widget class="QRadioButton" name="disabledRadio" >
+        <property name="text" >
+         <string>Disabled</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QRadioButton" name="inactiveRadio" >
+        <property name="text" >
+         <string>Inactive</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="activeRadio" >
+        <property name="text" >
+         <string>Active</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="qdesigner_internal::PreviewFrame" native="1" name="previewFrame" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>7</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QtColorButton</class>
+   <extends>QToolButton</extends>
+   <header>qtcolorbutton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>qdesigner_internal::PreviewFrame</class>
+   <extends>QWidget</extends>
+   <header>previewframe.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qdesigner_internal::PaletteEditor</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>180</x>
+     <y>331</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>134</x>
+     <y>341</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qdesigner_internal::PaletteEditor</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>287</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>302</x>
+     <y>342</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h
new file mode 100644
index 0000000..9310ab8
--- /dev/null
+++ b/tests/auto/uic/baseline/paletteeditor.ui.h
@@ -0,0 +1,240 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'paletteeditor.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PALETTEEDITOR_H
+#define PALETTEEDITOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QTreeView>
+#include <QtGui/QVBoxLayout>
+#include "previewframe.h"
+#include "qtcolorbutton.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_PaletteEditor
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *advancedBox;
+    QGridLayout *gridLayout;
+    QtColorButton *buildButton;
+    QTreeView *paletteView;
+    QRadioButton *detailsRadio;
+    QRadioButton *computeRadio;
+    QLabel *label;
+    QGroupBox *GroupBox126;
+    QGridLayout *gridLayout1;
+    QRadioButton *disabledRadio;
+    QRadioButton *inactiveRadio;
+    QRadioButton *activeRadio;
+    qdesigner_internal::PreviewFrame *previewFrame;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *qdesigner_internal__PaletteEditor)
+    {
+        if (qdesigner_internal__PaletteEditor->objectName().isEmpty())
+            qdesigner_internal__PaletteEditor->setObjectName(QString::fromUtf8("qdesigner_internal__PaletteEditor"));
+        qdesigner_internal__PaletteEditor->resize(365, 409);
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(qdesigner_internal__PaletteEditor->sizePolicy().hasHeightForWidth());
+        qdesigner_internal__PaletteEditor->setSizePolicy(sizePolicy);
+        vboxLayout = new QVBoxLayout(qdesigner_internal__PaletteEditor);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        advancedBox = new QGroupBox(qdesigner_internal__PaletteEditor);
+        advancedBox->setObjectName(QString::fromUtf8("advancedBox"));
+        advancedBox->setMinimumSize(QSize(0, 0));
+        advancedBox->setMaximumSize(QSize(16777215, 16777215));
+        gridLayout = new QGridLayout(advancedBox);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        buildButton = new QtColorButton(advancedBox);
+        buildButton->setObjectName(QString::fromUtf8("buildButton"));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(13));
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(buildButton->sizePolicy().hasHeightForWidth());
+        buildButton->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(buildButton, 0, 1, 1, 1);
+
+        paletteView = new QTreeView(advancedBox);
+        paletteView->setObjectName(QString::fromUtf8("paletteView"));
+        paletteView->setMinimumSize(QSize(0, 200));
+
+        gridLayout->addWidget(paletteView, 1, 0, 1, 4);
+
+        detailsRadio = new QRadioButton(advancedBox);
+        detailsRadio->setObjectName(QString::fromUtf8("detailsRadio"));
+
+        gridLayout->addWidget(detailsRadio, 0, 3, 1, 1);
+
+        computeRadio = new QRadioButton(advancedBox);
+        computeRadio->setObjectName(QString::fromUtf8("computeRadio"));
+        computeRadio->setChecked(true);
+
+        gridLayout->addWidget(computeRadio, 0, 2, 1, 1);
+
+        label = new QLabel(advancedBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+
+        vboxLayout->addWidget(advancedBox);
+
+        GroupBox126 = new QGroupBox(qdesigner_internal__PaletteEditor);
+        GroupBox126->setObjectName(QString::fromUtf8("GroupBox126"));
+        QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(7));
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(GroupBox126->sizePolicy().hasHeightForWidth());
+        GroupBox126->setSizePolicy(sizePolicy2);
+        gridLayout1 = new QGridLayout(GroupBox126);
+#ifndef Q_OS_MAC
+        gridLayout1->setSpacing(6);
+#endif
+        gridLayout1->setMargin(8);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        disabledRadio = new QRadioButton(GroupBox126);
+        disabledRadio->setObjectName(QString::fromUtf8("disabledRadio"));
+
+        gridLayout1->addWidget(disabledRadio, 0, 2, 1, 1);
+
+        inactiveRadio = new QRadioButton(GroupBox126);
+        inactiveRadio->setObjectName(QString::fromUtf8("inactiveRadio"));
+
+        gridLayout1->addWidget(inactiveRadio, 0, 1, 1, 1);
+
+        activeRadio = new QRadioButton(GroupBox126);
+        activeRadio->setObjectName(QString::fromUtf8("activeRadio"));
+        activeRadio->setChecked(true);
+
+        gridLayout1->addWidget(activeRadio, 0, 0, 1, 1);
+
+        previewFrame = new qdesigner_internal::PreviewFrame(GroupBox126);
+        previewFrame->setObjectName(QString::fromUtf8("previewFrame"));
+        sizePolicy.setHeightForWidth(previewFrame->sizePolicy().hasHeightForWidth());
+        previewFrame->setSizePolicy(sizePolicy);
+
+        gridLayout1->addWidget(previewFrame, 1, 0, 1, 3);
+
+
+        vboxLayout->addWidget(GroupBox126);
+
+        buttonBox = new QDialogButtonBox(qdesigner_internal__PaletteEditor);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(qdesigner_internal__PaletteEditor);
+        QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__PaletteEditor, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__PaletteEditor, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__PaletteEditor);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__PaletteEditor)
+    {
+        qdesigner_internal__PaletteEditor->setWindowTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Edit Palette", 0, QApplication::UnicodeUTF8));
+        advancedBox->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Tune Palette", 0, QApplication::UnicodeUTF8));
+        buildButton->setText(QString());
+        detailsRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Show Details", 0, QApplication::UnicodeUTF8));
+        computeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Compute Details", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Quick", 0, QApplication::UnicodeUTF8));
+        GroupBox126->setTitle(QApplication::translate("qdesigner_internal::PaletteEditor", "Preview", 0, QApplication::UnicodeUTF8));
+        disabledRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Disabled", 0, QApplication::UnicodeUTF8));
+        inactiveRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Inactive", 0, QApplication::UnicodeUTF8));
+        activeRadio->setText(QApplication::translate("qdesigner_internal::PaletteEditor", "Active", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__PaletteEditor);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class PaletteEditor: public Ui_PaletteEditor {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // PALETTEEDITOR_H
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
new file mode 100644
index 0000000..c8f539e
--- /dev/null
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
@@ -0,0 +1,616 @@
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+  <exportmacro></exportmacro>
+  <class>PaletteEditorAdvancedBase</class>
+  <widget class="QDialog" name="PaletteEditorAdvancedBase" >
+    <property name="objectName" >
+      <string notr="true" >PaletteEditorAdvancedBase</string>
+    </property>
+    <property name="enabled" >
+      <bool>true</bool>
+    </property>
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>295</width>
+        <height>346</height>
+      </rect>
+    </property>
+    <property name="windowTitle" >
+      <string>Tune Palette</string>
+    </property>
+    <property name="sizeGripEnabled" >
+      <bool>true</bool>
+    </property>
+    <property name="whatsThis" stdset="0" >
+      <string>&lt;b>Edit Palette&lt;/b>&lt;p>Change the palette of the current widget or form.&lt;/p>&lt;p>Use a generated palette or select colors for each color group and each color role.&lt;/p>&lt;p>The palette can be tested with different widget layouts in the preview section.&lt;/p></string>
+    </property>
+    <layout class="QVBoxLayout" >
+      <property name="objectName" >
+        <string notr="true" >unnamed</string>
+      </property>
+      <property name="margin" >
+        <number>11</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item>
+        <layout class="QHBoxLayout" >
+          <property name="objectName" >
+            <string notr="true" >unnamed</string>
+          </property>
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLabel" name="TextLabel1" >
+              <property name="objectName" >
+                <string notr="true" >TextLabel1</string>
+              </property>
+              <property name="text" >
+                <string>Select &amp;Palette:</string>
+              </property>
+              <property name="buddy" stdset="0" >
+                <cstring>paletteCombo</cstring>
+              </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="QComboBox" name="paletteCombo" >
+              <property name="objectName" >
+                <string notr="true" >paletteCombo</string>
+              </property>
+              <item>
+                <property name="text" >
+                  <string>Active Palette</string>
+                </property>
+              </item>
+              <item>
+                <property name="text" >
+                  <string>Inactive Palette</string>
+                </property>
+              </item>
+              <item>
+                <property name="text" >
+                  <string>Disabled Palette</string>
+                </property>
+              </item>
+            </widget>
+          </item>
+        </layout>
+      </item>
+      <item>
+        <widget class="Q3ButtonGroup" name="ButtonGroup1" >
+          <property name="objectName" >
+            <string notr="true" >ButtonGroup1</string>
+          </property>
+          <property name="sizePolicy" >
+            <sizepolicy>
+              <hsizetype>5</hsizetype>
+              <vsizetype>4</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+            </sizepolicy>
+          </property>
+          <property name="title" >
+            <string>Auto</string>
+          </property>
+          <layout class="QVBoxLayout" >
+            <property name="objectName" >
+              <string notr="true" >unnamed</string>
+            </property>
+            <property name="margin" >
+              <number>11</number>
+            </property>
+            <property name="spacing" >
+              <number>6</number>
+            </property>
+            <item>
+              <widget class="QCheckBox" name="checkBuildInactive" >
+                <property name="objectName" >
+                  <string notr="true" >checkBuildInactive</string>
+                </property>
+                <property name="text" >
+                  <string>Build inactive palette from active</string>
+                </property>
+                <property name="checked" >
+                  <bool>true</bool>
+                </property>
+              </widget>
+            </item>
+            <item>
+              <widget class="QCheckBox" name="checkBuildDisabled" >
+                <property name="objectName" >
+                  <string notr="true" >checkBuildDisabled</string>
+                </property>
+                <property name="text" >
+                  <string>Build disabled palette from active</string>
+                </property>
+                <property name="checked" >
+                  <bool>true</bool>
+                </property>
+              </widget>
+            </item>
+          </layout>
+        </widget>
+      </item>
+      <item>
+        <widget class="Q3GroupBox" name="groupCentral" >
+          <property name="objectName" >
+            <string notr="true" >groupCentral</string>
+          </property>
+          <property name="title" >
+            <string>Central color &amp;roles</string>
+          </property>
+          <layout class="QVBoxLayout" >
+            <property name="objectName" >
+              <string notr="true" >unnamed</string>
+            </property>
+            <property name="margin" >
+              <number>11</number>
+            </property>
+            <property name="spacing" >
+              <number>6</number>
+            </property>
+            <item>
+              <widget class="QComboBox" name="comboCentral" >
+                <property name="objectName" >
+                  <string notr="true" >comboCentral</string>
+                </property>
+                <property name="toolTip" stdset="0" >
+                  <string>Choose central color role</string>
+                </property>
+                <property name="whatsThis" stdset="0" >
+                  <string>&lt;b>Select a color role.&lt;/b>&lt;p>Available central roles are: &lt;ul> &lt;li>Window - general background color.&lt;/li> &lt;li>WindowText - general foreground color. &lt;/li> &lt;li>Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li> &lt;li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li> &lt;li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li> &lt;li>ButtonText - a foreground color used with the Button color. &lt;/li> &lt;li>Highlight - a color to indicate a selected or highlighted item. &lt;/li> &lt;li>HighlightedText - a text color that contrasts to Highlight. &lt;/li> &lt;li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li> &lt;/ul> &lt;/p></string>
+                </property>
+                <item>
+                  <property name="text" >
+                    <string>Window</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>WindowText</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>Button</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>Base</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>Text</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>BrightText</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>ButtonText</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>Highlight</string>
+                  </property>
+                </item>
+                <item>
+                  <property name="text" >
+                    <string>HighlightedText</string>
+                  </property>
+                </item>
+              </widget>
+            </item>
+            <item>
+              <layout class="QHBoxLayout" >
+                <property name="objectName" >
+                  <string notr="true" >unnamed</string>
+                </property>
+                <property name="margin" >
+                  <number>0</number>
+                </property>
+                <property name="spacing" >
+                  <number>6</number>
+                </property>
+                <item>
+                  <spacer name="Horizontal_Spacing1" >
+                    <property name="sizeHint" >
+                      <size>
+                        <width>20</width>
+                        <height>20</height>
+                      </size>
+                    </property>
+                    <property name="sizeType" >
+                      <enum>Expanding</enum>
+                    </property>
+                    <property name="orientation" >
+                      <enum>Horizontal</enum>
+                    </property>
+                  </spacer>
+                </item>
+                <item>
+                  <widget class="QLabel" name="labelCentral" >
+                    <property name="objectName" >
+                      <string notr="true" >labelCentral</string>
+                    </property>
+                    <property name="sizePolicy" >
+                      <sizepolicy>
+                        <hsizetype>1</hsizetype>
+                        <vsizetype>1</vsizetype>
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                      </sizepolicy>
+                    </property>
+                    <property name="minimumSize" >
+                      <size>
+                        <width>0</width>
+                        <height>0</height>
+                      </size>
+                    </property>
+                    <property name="text" >
+                      <string>&amp;Select Color:</string>
+                    </property>
+                    <property name="buddy" stdset="0" >
+                      <cstring>buttonCentral</cstring>
+                    </property>
+                  </widget>
+                </item>
+                <item>
+                  <widget class="ColorButton" name="buttonCentral" >
+                    <property name="objectName" >
+                      <string notr="true" >buttonCentral</string>
+                    </property>
+                    <property name="sizePolicy" >
+                      <sizepolicy>
+                        <hsizetype>0</hsizetype>
+                        <vsizetype>0</vsizetype>
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                      </sizepolicy>
+                    </property>
+                    <property name="focusPolicy" >
+                      <enum>Qt::TabFocus</enum>
+                    </property>
+                    <property name="toolTip" stdset="0" >
+                      <string>Choose a color</string>
+                    </property>
+                    <property name="whatsThis" stdset="0" >
+                      <string>Choose a color for the selected central color role.</string>
+                    </property>
+                  </widget>
+                </item>
+              </layout>
+            </item>
+          </layout>
+        </widget>
+      </item>
+      <item>
+        <widget class="Q3GroupBox" name="groupEffect" >
+          <property name="objectName" >
+            <string notr="true" >groupEffect</string>
+          </property>
+          <property name="title" >
+            <string>3-D shadow &amp;effects</string>
+          </property>
+          <layout class="QVBoxLayout" >
+            <property name="objectName" >
+              <string notr="true" >unnamed</string>
+            </property>
+            <property name="margin" >
+              <number>11</number>
+            </property>
+            <property name="spacing" >
+              <number>6</number>
+            </property>
+            <item>
+              <layout class="QHBoxLayout" >
+                <property name="objectName" >
+                  <string notr="true" >unnamed</string>
+                </property>
+                <property name="margin" >
+                  <number>0</number>
+                </property>
+                <property name="spacing" >
+                  <number>6</number>
+                </property>
+                <item>
+                  <widget class="QCheckBox" name="checkBuildEffect" >
+                    <property name="objectName" >
+                      <string notr="true" >checkBuildEffect</string>
+                    </property>
+                    <property name="text" >
+                      <string>Build &amp;from button color</string>
+                    </property>
+                    <property name="checked" >
+                      <bool>true</bool>
+                    </property>
+                    <property name="toolTip" stdset="0" >
+                      <string>Generate shadings</string>
+                    </property>
+                    <property name="whatsThis" stdset="0" >
+                      <string>Check to let 3D-effect colors be calculated from button-color.</string>
+                    </property>
+                  </widget>
+                </item>
+                <item>
+                  <widget class="QComboBox" name="comboEffect" >
+                    <property name="objectName" >
+                      <string notr="true" >comboEffect</string>
+                    </property>
+                    <property name="toolTip" stdset="0" >
+                      <string>Choose 3D-effect color role</string>
+                    </property>
+                    <property name="whatsThis" stdset="0" >
+                      <string>&lt;b>Select a color role.&lt;/b>&lt;p>Available effect roles are: &lt;ul> &lt;li>Light - lighter than Button color. &lt;/li> &lt;li>Midlight - between Button and Light. &lt;/li> &lt;li>Mid - between Button and Dark. &lt;/li> &lt;li>Dark - darker than Button. &lt;/li> &lt;li>Shadow - a very dark color. &lt;/li> &lt;/ul></string>
+                    </property>
+                    <item>
+                      <property name="text" >
+                        <string>Light</string>
+                      </property>
+                    </item>
+                    <item>
+                      <property name="text" >
+                        <string>Midlight</string>
+                      </property>
+                    </item>
+                    <item>
+                      <property name="text" >
+                        <string>Mid</string>
+                      </property>
+                    </item>
+                    <item>
+                      <property name="text" >
+                        <string>Dark</string>
+                      </property>
+                    </item>
+                    <item>
+                      <property name="text" >
+                        <string>Shadow</string>
+                      </property>
+                    </item>
+                  </widget>
+                </item>
+              </layout>
+            </item>
+            <item>
+              <layout class="QHBoxLayout" >
+                <property name="objectName" >
+                  <string notr="true" >unnamed</string>
+                </property>
+                <property name="margin" >
+                  <number>0</number>
+                </property>
+                <property name="spacing" >
+                  <number>6</number>
+                </property>
+                <item>
+                  <spacer name="Horizontal_Spacing3" >
+                    <property name="sizeHint" >
+                      <size>
+                        <width>20</width>
+                        <height>20</height>
+                      </size>
+                    </property>
+                    <property name="sizeType" >
+                      <enum>Expanding</enum>
+                    </property>
+                    <property name="orientation" >
+                      <enum>Horizontal</enum>
+                    </property>
+                  </spacer>
+                </item>
+                <item>
+                  <widget class="QLabel" name="labelEffect" >
+                    <property name="objectName" >
+                      <string notr="true" >labelEffect</string>
+                    </property>
+                    <property name="sizePolicy" >
+                      <sizepolicy>
+                        <hsizetype>1</hsizetype>
+                        <vsizetype>1</vsizetype>
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                      </sizepolicy>
+                    </property>
+                    <property name="minimumSize" >
+                      <size>
+                        <width>0</width>
+                        <height>0</height>
+                      </size>
+                    </property>
+                    <property name="text" >
+                      <string>Select Co&amp;lor:</string>
+                    </property>
+                    <property name="buddy" stdset="0" >
+                      <cstring>buttonEffect</cstring>
+                    </property>
+                  </widget>
+                </item>
+                <item>
+                  <widget class="ColorButton" name="buttonEffect" >
+                    <property name="objectName" >
+                      <string notr="true" >buttonEffect</string>
+                    </property>
+                    <property name="sizePolicy" >
+                      <sizepolicy>
+                        <hsizetype>0</hsizetype>
+                        <vsizetype>0</vsizetype>
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                      </sizepolicy>
+                    </property>
+                    <property name="focusPolicy" >
+                      <enum>Qt::TabFocus</enum>
+                    </property>
+                    <property name="toolTip" stdset="0" >
+                      <string>Choose a color</string>
+                    </property>
+                    <property name="whatsThis" stdset="0" >
+                      <string>Choose a color for the selected effect color role.</string>
+                    </property>
+                  </widget>
+                </item>
+              </layout>
+            </item>
+          </layout>
+        </widget>
+      </item>
+      <item>
+        <layout class="QHBoxLayout" >
+          <property name="objectName" >
+            <string notr="true" >unnamed</string>
+          </property>
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <spacer name="Horizontal_Spacing2" >
+              <property name="sizeHint" >
+                <size>
+                  <width>20</width>
+                  <height>20</height>
+                </size>
+              </property>
+              <property name="sizeType" >
+                <enum>Expanding</enum>
+              </property>
+              <property name="orientation" >
+                <enum>Horizontal</enum>
+              </property>
+            </spacer>
+          </item>
+          <item>
+            <widget class="QPushButton" name="buttonOk" >
+              <property name="objectName" >
+                <string notr="true" >buttonOk</string>
+              </property>
+              <property name="text" >
+                <string>OK</string>
+              </property>
+              <property name="autoDefault" >
+                <bool>true</bool>
+              </property>
+              <property name="default" >
+                <bool>true</bool>
+              </property>
+              <property name="whatsThis" stdset="0" >
+                <string>Close dialog and apply all changes.</string>
+              </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="QPushButton" name="buttonCancel" >
+              <property name="objectName" >
+                <string notr="true" >buttonCancel</string>
+              </property>
+              <property name="text" >
+                <string>Cancel</string>
+              </property>
+              <property name="autoDefault" >
+                <bool>true</bool>
+              </property>
+              <property name="whatsThis" stdset="0" >
+                <string>Close dialog and discard all changes.</string>
+              </property>
+            </widget>
+          </item>
+        </layout>
+      </item>
+    </layout>
+  </widget>
+  <pixmapfunction></pixmapfunction>
+  <customwidgets>
+    <customwidget>
+      <class>ColorButton</class>
+      <extends></extends>
+      <header location="local" >colorbutton.h</header>
+      <sizehint>
+        <width>40</width>
+        <height>25</height>
+      </sizehint>
+      <container>0</container>
+      <sizepolicy>
+        <hordata>5</hordata>
+        <verdata>5</verdata>
+      </sizepolicy>
+      <pixmap>image0</pixmap>
+      <properties>
+        <property type="Color" >color</property>
+        <property type="Pixmap" >pixmap</property>
+      </properties>
+    </customwidget>
+  </customwidgets>
+  <tabstops>
+    <tabstop>buttonOk</tabstop>
+    <tabstop>buttonCancel</tabstop>
+    <tabstop>paletteCombo</tabstop>
+    <tabstop>checkBuildInactive</tabstop>
+    <tabstop>checkBuildDisabled</tabstop>
+    <tabstop>comboCentral</tabstop>
+    <tabstop>buttonCentral</tabstop>
+    <tabstop>checkBuildEffect</tabstop>
+    <tabstop>comboEffect</tabstop>
+    <tabstop>buttonEffect</tabstop>
+  </tabstops>
+  <images>
+    <image name="image0" >
+      <data format="XPM.GZ" length="646" >789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
+    </image>
+  </images>
+</ui>
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
new file mode 100644
index 0000000..618ddfc
--- /dev/null
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
@@ -0,0 +1,484 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'paletteeditoradvancedbase.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PALETTEEDITORADVANCEDBASE_H
+#define PALETTEEDITORADVANCEDBASE_H
+
+#include <Qt3Support/Q3ButtonGroup>
+#include <Qt3Support/Q3GroupBox>
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+#include "colorbutton.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PaletteEditorAdvancedBase
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QLabel *TextLabel1;
+    QComboBox *paletteCombo;
+    Q3ButtonGroup *ButtonGroup1;
+    QVBoxLayout *vboxLayout1;
+    QCheckBox *checkBuildInactive;
+    QCheckBox *checkBuildDisabled;
+    Q3GroupBox *groupCentral;
+    QVBoxLayout *vboxLayout2;
+    QComboBox *comboCentral;
+    QHBoxLayout *hboxLayout1;
+    QSpacerItem *Horizontal_Spacing1;
+    QLabel *labelCentral;
+    ColorButton *buttonCentral;
+    Q3GroupBox *groupEffect;
+    QVBoxLayout *vboxLayout3;
+    QHBoxLayout *hboxLayout2;
+    QCheckBox *checkBuildEffect;
+    QComboBox *comboEffect;
+    QHBoxLayout *hboxLayout3;
+    QSpacerItem *Horizontal_Spacing3;
+    QLabel *labelEffect;
+    ColorButton *buttonEffect;
+    QHBoxLayout *hboxLayout4;
+    QSpacerItem *Horizontal_Spacing2;
+    QPushButton *buttonOk;
+    QPushButton *buttonCancel;
+
+    void setupUi(QDialog *PaletteEditorAdvancedBase)
+    {
+        if (PaletteEditorAdvancedBase->objectName().isEmpty())
+            PaletteEditorAdvancedBase->setObjectName(QString::fromUtf8("PaletteEditorAdvancedBase"));
+        PaletteEditorAdvancedBase->setEnabled(true);
+        PaletteEditorAdvancedBase->resize(295, 346);
+        PaletteEditorAdvancedBase->setSizeGripEnabled(true);
+        vboxLayout = new QVBoxLayout(PaletteEditorAdvancedBase);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(11);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("unnamed"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(0);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
+        TextLabel1 = new QLabel(PaletteEditorAdvancedBase);
+        TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+
+        hboxLayout->addWidget(TextLabel1);
+
+        paletteCombo = new QComboBox(PaletteEditorAdvancedBase);
+        paletteCombo->setObjectName(QString::fromUtf8("paletteCombo"));
+
+        hboxLayout->addWidget(paletteCombo);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        ButtonGroup1 = new Q3ButtonGroup(PaletteEditorAdvancedBase);
+        ButtonGroup1->setObjectName(QString::fromUtf8("ButtonGroup1"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(4));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(ButtonGroup1->sizePolicy().hasHeightForWidth());
+        ButtonGroup1->setSizePolicy(sizePolicy);
+        ButtonGroup1->setColumnLayout(0, Qt::Vertical);
+#ifndef Q_OS_MAC
+        ButtonGroup1->layout()->setSpacing(6);
+#endif
+        ButtonGroup1->layout()->setMargin(11);
+        vboxLayout1 = new QVBoxLayout();
+        QBoxLayout *boxlayout = qobject_cast<QBoxLayout *>(ButtonGroup1->layout());
+        if (boxlayout)
+            boxlayout->addLayout(vboxLayout1);
+        vboxLayout1->setAlignment(Qt::AlignTop);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
+        checkBuildInactive = new QCheckBox(ButtonGroup1);
+        checkBuildInactive->setObjectName(QString::fromUtf8("checkBuildInactive"));
+        checkBuildInactive->setChecked(true);
+
+        vboxLayout1->addWidget(checkBuildInactive);
+
+        checkBuildDisabled = new QCheckBox(ButtonGroup1);
+        checkBuildDisabled->setObjectName(QString::fromUtf8("checkBuildDisabled"));
+        checkBuildDisabled->setChecked(true);
+
+        vboxLayout1->addWidget(checkBuildDisabled);
+
+
+        vboxLayout->addWidget(ButtonGroup1);
+
+        groupCentral = new Q3GroupBox(PaletteEditorAdvancedBase);
+        groupCentral->setObjectName(QString::fromUtf8("groupCentral"));
+        groupCentral->setColumnLayout(0, Qt::Vertical);
+#ifndef Q_OS_MAC
+        groupCentral->layout()->setSpacing(6);
+#endif
+        groupCentral->layout()->setMargin(11);
+        vboxLayout2 = new QVBoxLayout();
+        QBoxLayout *boxlayout1 = qobject_cast<QBoxLayout *>(groupCentral->layout());
+        if (boxlayout1)
+            boxlayout1->addLayout(vboxLayout2);
+        vboxLayout2->setAlignment(Qt::AlignTop);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setObjectName(QString::fromUtf8("unnamed"));
+        comboCentral = new QComboBox(groupCentral);
+        comboCentral->setObjectName(QString::fromUtf8("comboCentral"));
+
+        vboxLayout2->addWidget(comboCentral);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        hboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
+        Horizontal_Spacing1 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(Horizontal_Spacing1);
+
+        labelCentral = new QLabel(groupCentral);
+        labelCentral->setObjectName(QString::fromUtf8("labelCentral"));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(1));
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(labelCentral->sizePolicy().hasHeightForWidth());
+        labelCentral->setSizePolicy(sizePolicy1);
+        labelCentral->setMinimumSize(QSize(0, 0));
+
+        hboxLayout1->addWidget(labelCentral);
+
+        buttonCentral = new ColorButton(groupCentral);
+        buttonCentral->setObjectName(QString::fromUtf8("buttonCentral"));
+        QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(buttonCentral->sizePolicy().hasHeightForWidth());
+        buttonCentral->setSizePolicy(sizePolicy2);
+        buttonCentral->setFocusPolicy(Qt::TabFocus);
+
+        hboxLayout1->addWidget(buttonCentral);
+
+
+        vboxLayout2->addLayout(hboxLayout1);
+
+
+        vboxLayout->addWidget(groupCentral);
+
+        groupEffect = new Q3GroupBox(PaletteEditorAdvancedBase);
+        groupEffect->setObjectName(QString::fromUtf8("groupEffect"));
+        groupEffect->setColumnLayout(0, Qt::Vertical);
+#ifndef Q_OS_MAC
+        groupEffect->layout()->setSpacing(6);
+#endif
+        groupEffect->layout()->setMargin(11);
+        vboxLayout3 = new QVBoxLayout();
+        QBoxLayout *boxlayout2 = qobject_cast<QBoxLayout *>(groupEffect->layout());
+        if (boxlayout2)
+            boxlayout2->addLayout(vboxLayout3);
+        vboxLayout3->setAlignment(Qt::AlignTop);
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        vboxLayout3->setObjectName(QString::fromUtf8("unnamed"));
+        hboxLayout2 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout2->setMargin(0);
+#endif
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        hboxLayout2->setObjectName(QString::fromUtf8("unnamed"));
+        checkBuildEffect = new QCheckBox(groupEffect);
+        checkBuildEffect->setObjectName(QString::fromUtf8("checkBuildEffect"));
+        checkBuildEffect->setChecked(true);
+
+        hboxLayout2->addWidget(checkBuildEffect);
+
+        comboEffect = new QComboBox(groupEffect);
+        comboEffect->setObjectName(QString::fromUtf8("comboEffect"));
+
+        hboxLayout2->addWidget(comboEffect);
+
+
+        vboxLayout3->addLayout(hboxLayout2);
+
+        hboxLayout3 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout3->setSpacing(6);
+#endif
+        hboxLayout3->setMargin(0);
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        hboxLayout3->setObjectName(QString::fromUtf8("unnamed"));
+        Horizontal_Spacing3 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout3->addItem(Horizontal_Spacing3);
+
+        labelEffect = new QLabel(groupEffect);
+        labelEffect->setObjectName(QString::fromUtf8("labelEffect"));
+        sizePolicy1.setHeightForWidth(labelEffect->sizePolicy().hasHeightForWidth());
+        labelEffect->setSizePolicy(sizePolicy1);
+        labelEffect->setMinimumSize(QSize(0, 0));
+
+        hboxLayout3->addWidget(labelEffect);
+
+        buttonEffect = new ColorButton(groupEffect);
+        buttonEffect->setObjectName(QString::fromUtf8("buttonEffect"));
+        sizePolicy2.setHeightForWidth(buttonEffect->sizePolicy().hasHeightForWidth());
+        buttonEffect->setSizePolicy(sizePolicy2);
+        buttonEffect->setFocusPolicy(Qt::TabFocus);
+
+        hboxLayout3->addWidget(buttonEffect);
+
+
+        vboxLayout3->addLayout(hboxLayout3);
+
+
+        vboxLayout->addWidget(groupEffect);
+
+        hboxLayout4 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout4->setSpacing(6);
+#endif
+        hboxLayout4->setMargin(0);
+        hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
+        hboxLayout4->setObjectName(QString::fromUtf8("unnamed"));
+        Horizontal_Spacing2 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout4->addItem(Horizontal_Spacing2);
+
+        buttonOk = new QPushButton(PaletteEditorAdvancedBase);
+        buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
+        buttonOk->setAutoDefault(true);
+        buttonOk->setDefault(true);
+
+        hboxLayout4->addWidget(buttonOk);
+
+        buttonCancel = new QPushButton(PaletteEditorAdvancedBase);
+        buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+        buttonCancel->setAutoDefault(true);
+
+        hboxLayout4->addWidget(buttonCancel);
+
+
+        vboxLayout->addLayout(hboxLayout4);
+
+#ifndef QT_NO_SHORTCUT
+        TextLabel1->setBuddy(paletteCombo);
+        labelCentral->setBuddy(buttonCentral);
+        labelEffect->setBuddy(buttonEffect);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(buttonOk, buttonCancel);
+        QWidget::setTabOrder(buttonCancel, paletteCombo);
+        QWidget::setTabOrder(paletteCombo, checkBuildInactive);
+        QWidget::setTabOrder(checkBuildInactive, checkBuildDisabled);
+        QWidget::setTabOrder(checkBuildDisabled, comboCentral);
+        QWidget::setTabOrder(comboCentral, buttonCentral);
+        QWidget::setTabOrder(buttonCentral, checkBuildEffect);
+        QWidget::setTabOrder(checkBuildEffect, comboEffect);
+        QWidget::setTabOrder(comboEffect, buttonEffect);
+
+        retranslateUi(PaletteEditorAdvancedBase);
+
+        QMetaObject::connectSlotsByName(PaletteEditorAdvancedBase);
+    } // setupUi
+
+    void retranslateUi(QDialog *PaletteEditorAdvancedBase)
+    {
+        PaletteEditorAdvancedBase->setWindowTitle(QApplication::translate("PaletteEditorAdvancedBase", "Tune Palette", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        PaletteEditorAdvancedBase->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "<b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p>", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        TextLabel1->setText(QApplication::translate("PaletteEditorAdvancedBase", "Select &Palette:", 0, QApplication::UnicodeUTF8));
+        paletteCombo->clear();
+        paletteCombo->insertItems(0, QStringList()
+         << QApplication::translate("PaletteEditorAdvancedBase", "Active Palette", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Inactive Palette", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Disabled Palette", 0, QApplication::UnicodeUTF8)
+        );
+        ButtonGroup1->setTitle(QApplication::translate("PaletteEditorAdvancedBase", "Auto", 0, QApplication::UnicodeUTF8));
+        checkBuildInactive->setText(QApplication::translate("PaletteEditorAdvancedBase", "Build inactive palette from active", 0, QApplication::UnicodeUTF8));
+        checkBuildDisabled->setText(QApplication::translate("PaletteEditorAdvancedBase", "Build disabled palette from active", 0, QApplication::UnicodeUTF8));
+        groupCentral->setTitle(QApplication::translate("PaletteEditorAdvancedBase", "Central color &roles", 0, QApplication::UnicodeUTF8));
+        comboCentral->clear();
+        comboCentral->insertItems(0, QStringList()
+         << QApplication::translate("PaletteEditorAdvancedBase", "Window", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "WindowText", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Button", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Base", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Text", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "BrightText", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "ButtonText", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Highlight", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "HighlightedText", 0, QApplication::UnicodeUTF8)
+        );
+#ifndef QT_NO_TOOLTIP
+        comboCentral->setProperty("toolTip", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Choose central color role", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        comboCentral->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "<b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p>", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        labelCentral->setText(QApplication::translate("PaletteEditorAdvancedBase", "&Select Color:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        buttonCentral->setProperty("toolTip", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Choose a color", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        buttonCentral->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Choose a color for the selected central color role.", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        groupEffect->setTitle(QApplication::translate("PaletteEditorAdvancedBase", "3-D shadow &effects", 0, QApplication::UnicodeUTF8));
+        checkBuildEffect->setText(QApplication::translate("PaletteEditorAdvancedBase", "Build &from button color", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        checkBuildEffect->setProperty("toolTip", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Generate shadings", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        checkBuildEffect->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Check to let 3D-effect colors be calculated from button-color.", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        comboEffect->clear();
+        comboEffect->insertItems(0, QStringList()
+         << QApplication::translate("PaletteEditorAdvancedBase", "Light", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Midlight", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Mid", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Dark", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("PaletteEditorAdvancedBase", "Shadow", 0, QApplication::UnicodeUTF8)
+        );
+#ifndef QT_NO_TOOLTIP
+        comboEffect->setProperty("toolTip", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Choose 3D-effect color role", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        comboEffect->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "<b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul>", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        labelEffect->setText(QApplication::translate("PaletteEditorAdvancedBase", "Select Co&lor:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        buttonEffect->setProperty("toolTip", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Choose a color", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        buttonEffect->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Choose a color for the selected effect color role.", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        buttonOk->setText(QApplication::translate("PaletteEditorAdvancedBase", "OK", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        buttonOk->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Close dialog and apply all changes.", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        buttonCancel->setText(QApplication::translate("PaletteEditorAdvancedBase", "Cancel", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        buttonCancel->setProperty("whatsThis", QVariant(QApplication::translate("PaletteEditorAdvancedBase", "Close dialog and discard all changes.", 0, QApplication::UnicodeUTF8)));
+#endif // QT_NO_WHATSTHIS
+        Q_UNUSED(PaletteEditorAdvancedBase);
+    } // retranslateUi
+
+
+protected:
+    enum IconID
+    {
+        image0_ID,
+        unknown_ID
+    };
+    static QPixmap qt_get_icon(IconID id)
+    {
+    static const char* const image0_data[] = { 
+"22 22 2 1",
+". c None",
+"# c #a4c610",
+"........######........",
+".....###########......",
+"....##############....",
+"...################...",
+"..######......######..",
+"..#####........#####..",
+".#####.......#..#####.",
+".####.......###..####.",
+"####.......#####..####",
+"####......#####...####",
+"####....#######...####",
+"####....######....####",
+"####...########...####",
+".####.##########..####",
+".####..####.#########.",
+".#####..##...########.",
+"..#####.......#######.",
+"..######......######..",
+"...###################",
+"....##################",
+"......###########.###.",
+"........######.....#.."};
+
+
+    switch (id) {
+        case image0_ID: return QPixmap((const char**)image0_data);
+        default: return QPixmap();
+    } // switch
+    } // icon
+
+};
+
+namespace Ui {
+    class PaletteEditorAdvancedBase: public Ui_PaletteEditorAdvancedBase {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PALETTEEDITORADVANCEDBASE_H
diff --git a/tests/auto/uic/baseline/passworddialog.ui b/tests/auto/uic/baseline/passworddialog.ui
new file mode 100644
index 0000000..7c16658
--- /dev/null
+++ b/tests/auto/uic/baseline/passworddialog.ui
@@ -0,0 +1,111 @@
+<ui version="4.0" >
+ <class>PasswordDialog</class>
+ <widget class="QDialog" name="PasswordDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>399</width>
+    <height>148</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Authentication Required</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="iconLabel" >
+       <property name="text" >
+        <string>DUMMY ICON</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="introLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>INTRO TEXT DUMMY</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="userNameLineEdit" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="lblPassword" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="passwordLineEdit" >
+     <property name="echoMode" >
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PasswordDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PasswordDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/passworddialog.ui.h b/tests/auto/uic/baseline/passworddialog.ui.h
new file mode 100644
index 0000000..267b5f2
--- /dev/null
+++ b/tests/auto/uic/baseline/passworddialog.ui.h
@@ -0,0 +1,121 @@
+/********************************************************************************
+** Form generated from reading ui file 'passworddialog.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PASSWORDDIALOG_H
+#define PASSWORDDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PasswordDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QHBoxLayout *hboxLayout;
+    QLabel *iconLabel;
+    QLabel *introLabel;
+    QLabel *label;
+    QLineEdit *userNameLineEdit;
+    QLabel *lblPassword;
+    QLineEdit *passwordLineEdit;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *PasswordDialog)
+    {
+        if (PasswordDialog->objectName().isEmpty())
+            PasswordDialog->setObjectName(QString::fromUtf8("PasswordDialog"));
+        PasswordDialog->resize(399, 148);
+        gridLayout = new QGridLayout(PasswordDialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        iconLabel = new QLabel(PasswordDialog);
+        iconLabel->setObjectName(QString::fromUtf8("iconLabel"));
+
+        hboxLayout->addWidget(iconLabel);
+
+        introLabel = new QLabel(PasswordDialog);
+        introLabel->setObjectName(QString::fromUtf8("introLabel"));
+        QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(introLabel->sizePolicy().hasHeightForWidth());
+        introLabel->setSizePolicy(sizePolicy);
+
+        hboxLayout->addWidget(introLabel);
+
+
+        gridLayout->addLayout(hboxLayout, 0, 0, 1, 2);
+
+        label = new QLabel(PasswordDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 1, 0, 1, 1);
+
+        userNameLineEdit = new QLineEdit(PasswordDialog);
+        userNameLineEdit->setObjectName(QString::fromUtf8("userNameLineEdit"));
+
+        gridLayout->addWidget(userNameLineEdit, 1, 1, 1, 1);
+
+        lblPassword = new QLabel(PasswordDialog);
+        lblPassword->setObjectName(QString::fromUtf8("lblPassword"));
+
+        gridLayout->addWidget(lblPassword, 2, 0, 1, 1);
+
+        passwordLineEdit = new QLineEdit(PasswordDialog);
+        passwordLineEdit->setObjectName(QString::fromUtf8("passwordLineEdit"));
+        passwordLineEdit->setEchoMode(QLineEdit::Password);
+
+        gridLayout->addWidget(passwordLineEdit, 2, 1, 1, 1);
+
+        buttonBox = new QDialogButtonBox(PasswordDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 3, 0, 1, 2);
+
+
+        retranslateUi(PasswordDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), PasswordDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), PasswordDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(PasswordDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *PasswordDialog)
+    {
+        PasswordDialog->setWindowTitle(QApplication::translate("PasswordDialog", "Authentication Required", 0, QApplication::UnicodeUTF8));
+        iconLabel->setText(QApplication::translate("PasswordDialog", "DUMMY ICON", 0, QApplication::UnicodeUTF8));
+        introLabel->setText(QApplication::translate("PasswordDialog", "INTRO TEXT DUMMY", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("PasswordDialog", "Username:", 0, QApplication::UnicodeUTF8));
+        lblPassword->setText(QApplication::translate("PasswordDialog", "Password:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PasswordDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PasswordDialog: public Ui_PasswordDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PASSWORDDIALOG_H
diff --git a/tests/auto/uic/baseline/pathpage.ui b/tests/auto/uic/baseline/pathpage.ui
new file mode 100644
index 0000000..8908391
--- /dev/null
+++ b/tests/auto/uic/baseline/pathpage.ui
@@ -0,0 +1,114 @@
+<ui version="4.0" >
+ <class>PathPage</class>
+ <widget class="QWidget" name="PathPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>243</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>File filters:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLineEdit" name="filterLineEdit" />
+   </item>
+   <item row="1" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="3" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Documentation source file paths:</string>
+     </property>
+    </widget>
+   </item>
+   <item rowspan="3" row="3" column="0" colspan="3" >
+    <widget class="QListWidget" name="pathListWidget" />
+   </item>
+   <item row="3" column="3" >
+    <widget class="QPushButton" name="addButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Add</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="3" >
+    <widget class="QPushButton" name="removeButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Remove</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>51</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/pathpage.ui.h b/tests/auto/uic/baseline/pathpage.ui.h
new file mode 100644
index 0000000..528fed8
--- /dev/null
+++ b/tests/auto/uic/baseline/pathpage.ui.h
@@ -0,0 +1,127 @@
+/********************************************************************************
+** Form generated from reading ui file 'pathpage.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PATHPAGE_H
+#define PATHPAGE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListWidget>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PathPage
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *label_2;
+    QLineEdit *filterLineEdit;
+    QSpacerItem *spacerItem;
+    QLabel *label;
+    QListWidget *pathListWidget;
+    QPushButton *addButton;
+    QPushButton *removeButton;
+    QSpacerItem *spacerItem1;
+    QSpacerItem *spacerItem2;
+
+    void setupUi(QWidget *PathPage)
+    {
+        if (PathPage->objectName().isEmpty())
+            PathPage->setObjectName(QString::fromUtf8("PathPage"));
+        PathPage->resize(417, 243);
+        gridLayout = new QGridLayout(PathPage);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label_2 = new QLabel(PathPage);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
+        label_2->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(label_2, 0, 0, 1, 1);
+
+        filterLineEdit = new QLineEdit(PathPage);
+        filterLineEdit->setObjectName(QString::fromUtf8("filterLineEdit"));
+
+        gridLayout->addWidget(filterLineEdit, 0, 1, 1, 2);
+
+        spacerItem = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem, 1, 1, 1, 1);
+
+        label = new QLabel(PathPage);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 2, 0, 1, 3);
+
+        pathListWidget = new QListWidget(PathPage);
+        pathListWidget->setObjectName(QString::fromUtf8("pathListWidget"));
+
+        gridLayout->addWidget(pathListWidget, 3, 0, 3, 3);
+
+        addButton = new QPushButton(PathPage);
+        addButton->setObjectName(QString::fromUtf8("addButton"));
+        QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Fixed);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(addButton->sizePolicy().hasHeightForWidth());
+        addButton->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(addButton, 3, 3, 1, 1);
+
+        removeButton = new QPushButton(PathPage);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+        sizePolicy1.setHeightForWidth(removeButton->sizePolicy().hasHeightForWidth());
+        removeButton->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(removeButton, 4, 3, 1, 1);
+
+        spacerItem1 = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem1, 5, 3, 1, 1);
+
+        spacerItem2 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem2, 6, 2, 1, 1);
+
+
+        retranslateUi(PathPage);
+
+        QMetaObject::connectSlotsByName(PathPage);
+    } // setupUi
+
+    void retranslateUi(QWidget *PathPage)
+    {
+        PathPage->setWindowTitle(QApplication::translate("PathPage", "Form", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("PathPage", "File filters:", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("PathPage", "Documentation source file paths:", 0, QApplication::UnicodeUTF8));
+        addButton->setText(QApplication::translate("PathPage", "Add", 0, QApplication::UnicodeUTF8));
+        removeButton->setText(QApplication::translate("PathPage", "Remove", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PathPage);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PathPage: public Ui_PathPage {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PATHPAGE_H
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui b/tests/auto/uic/baseline/phrasebookbox.ui
new file mode 100644
index 0000000..ebfa965
--- /dev/null
+++ b/tests/auto/uic/baseline/phrasebookbox.ui
@@ -0,0 +1,210 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>PhraseBookBox</class>
+ <widget class="QDialog" name="PhraseBookBox" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>596</width>
+    <height>454</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Edit Phrase Book</string>
+  </property>
+  <property name="whatsThis" >
+   <string>This window allows you to add, modify, or delete phrases in a phrase book.</string>
+  </property>
+  <layout class="QHBoxLayout" name="unnamed" >
+   <item>
+    <layout class="QVBoxLayout" name="inputsLayout" >
+     <item>
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="1" column="0" >
+        <widget class="QLabel" name="target" >
+         <property name="text" >
+          <string>&amp;Translation:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>targetLed</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="targetLed" >
+         <property name="whatsThis" >
+          <string>This is the phrase in the target language corresponding to the source phrase.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="source" >
+         <property name="text" >
+          <string>S&amp;ource phrase:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>sourceLed</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" >
+        <widget class="QLineEdit" name="definitionLed" >
+         <property name="whatsThis" >
+          <string>This is a definition for the source phrase.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="sourceLed" >
+         <property name="whatsThis" >
+          <string>This is the phrase in the source language.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="definition" >
+         <property name="text" >
+          <string>&amp;Definition:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>definitionLed</cstring>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QTreeView" name="phraseList" >
+       <property name="rootIsDecorated" >
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights" >
+        <bool>true</bool>
+       </property>
+       <property name="itemsExpandable" >
+        <bool>false</bool>
+       </property>
+       <property name="sortingEnabled" >
+        <bool>true</bool>
+       </property>
+       <property name="expandsOnDoubleClick" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="buttonLayout" >
+     <item>
+      <widget class="QPushButton" name="newBut" >
+       <property name="whatsThis" >
+        <string>Click here to add the phrase to the phrase book.</string>
+       </property>
+       <property name="text" >
+        <string>&amp;New Phrase</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeBut" >
+       <property name="whatsThis" >
+        <string>Click here to remove the phrase from the phrase book.</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Remove Phrase</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="saveBut" >
+       <property name="whatsThis" >
+        <string>Click here to save the changes made.</string>
+       </property>
+       <property name="text" >
+        <string>&amp;Save</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closeBut" >
+       <property name="whatsThis" >
+        <string>Click here to close this window.</string>
+       </property>
+       <property name="text" >
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer1" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>20</width>
+         <height>51</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <tabstops>
+  <tabstop>sourceLed</tabstop>
+  <tabstop>targetLed</tabstop>
+  <tabstop>definitionLed</tabstop>
+  <tabstop>newBut</tabstop>
+  <tabstop>removeBut</tabstop>
+  <tabstop>saveBut</tabstop>
+  <tabstop>closeBut</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/uic/baseline/phrasebookbox.ui.h
new file mode 100644
index 0000000..c87cbc2
--- /dev/null
+++ b/tests/auto/uic/baseline/phrasebookbox.ui.h
@@ -0,0 +1,245 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'phrasebookbox.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PHRASEBOOKBOX_H
+#define PHRASEBOOKBOX_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTreeView>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PhraseBookBox
+{
+public:
+    QHBoxLayout *unnamed;
+    QVBoxLayout *inputsLayout;
+    QGridLayout *gridLayout;
+    QLabel *target;
+    QLineEdit *targetLed;
+    QLabel *source;
+    QLineEdit *definitionLed;
+    QLineEdit *sourceLed;
+    QLabel *definition;
+    QTreeView *phraseList;
+    QVBoxLayout *buttonLayout;
+    QPushButton *newBut;
+    QPushButton *removeBut;
+    QPushButton *saveBut;
+    QPushButton *closeBut;
+    QSpacerItem *spacer1;
+
+    void setupUi(QDialog *PhraseBookBox)
+    {
+        if (PhraseBookBox->objectName().isEmpty())
+            PhraseBookBox->setObjectName(QString::fromUtf8("PhraseBookBox"));
+        PhraseBookBox->resize(596, 454);
+        unnamed = new QHBoxLayout(PhraseBookBox);
+        unnamed->setSpacing(6);
+        unnamed->setMargin(11);
+        unnamed->setObjectName(QString::fromUtf8("unnamed"));
+        inputsLayout = new QVBoxLayout();
+        inputsLayout->setSpacing(6);
+        inputsLayout->setObjectName(QString::fromUtf8("inputsLayout"));
+        gridLayout = new QGridLayout();
+        gridLayout->setSpacing(6);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        target = new QLabel(PhraseBookBox);
+        target->setObjectName(QString::fromUtf8("target"));
+
+        gridLayout->addWidget(target, 1, 0, 1, 1);
+
+        targetLed = new QLineEdit(PhraseBookBox);
+        targetLed->setObjectName(QString::fromUtf8("targetLed"));
+
+        gridLayout->addWidget(targetLed, 1, 1, 1, 1);
+
+        source = new QLabel(PhraseBookBox);
+        source->setObjectName(QString::fromUtf8("source"));
+
+        gridLayout->addWidget(source, 0, 0, 1, 1);
+
+        definitionLed = new QLineEdit(PhraseBookBox);
+        definitionLed->setObjectName(QString::fromUtf8("definitionLed"));
+
+        gridLayout->addWidget(definitionLed, 2, 1, 1, 1);
+
+        sourceLed = new QLineEdit(PhraseBookBox);
+        sourceLed->setObjectName(QString::fromUtf8("sourceLed"));
+
+        gridLayout->addWidget(sourceLed, 0, 1, 1, 1);
+
+        definition = new QLabel(PhraseBookBox);
+        definition->setObjectName(QString::fromUtf8("definition"));
+
+        gridLayout->addWidget(definition, 2, 0, 1, 1);
+
+
+        inputsLayout->addLayout(gridLayout);
+
+        phraseList = new QTreeView(PhraseBookBox);
+        phraseList->setObjectName(QString::fromUtf8("phraseList"));
+        phraseList->setRootIsDecorated(false);
+        phraseList->setUniformRowHeights(true);
+        phraseList->setItemsExpandable(false);
+        phraseList->setSortingEnabled(true);
+        phraseList->setExpandsOnDoubleClick(false);
+
+        inputsLayout->addWidget(phraseList);
+
+
+        unnamed->addLayout(inputsLayout);
+
+        buttonLayout = new QVBoxLayout();
+        buttonLayout->setSpacing(6);
+        buttonLayout->setObjectName(QString::fromUtf8("buttonLayout"));
+        newBut = new QPushButton(PhraseBookBox);
+        newBut->setObjectName(QString::fromUtf8("newBut"));
+
+        buttonLayout->addWidget(newBut);
+
+        removeBut = new QPushButton(PhraseBookBox);
+        removeBut->setObjectName(QString::fromUtf8("removeBut"));
+
+        buttonLayout->addWidget(removeBut);
+
+        saveBut = new QPushButton(PhraseBookBox);
+        saveBut->setObjectName(QString::fromUtf8("saveBut"));
+
+        buttonLayout->addWidget(saveBut);
+
+        closeBut = new QPushButton(PhraseBookBox);
+        closeBut->setObjectName(QString::fromUtf8("closeBut"));
+
+        buttonLayout->addWidget(closeBut);
+
+        spacer1 = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        buttonLayout->addItem(spacer1);
+
+
+        unnamed->addLayout(buttonLayout);
+
+#ifndef QT_NO_SHORTCUT
+        target->setBuddy(targetLed);
+        source->setBuddy(sourceLed);
+        definition->setBuddy(definitionLed);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(sourceLed, targetLed);
+        QWidget::setTabOrder(targetLed, definitionLed);
+        QWidget::setTabOrder(definitionLed, newBut);
+        QWidget::setTabOrder(newBut, removeBut);
+        QWidget::setTabOrder(removeBut, saveBut);
+        QWidget::setTabOrder(saveBut, closeBut);
+
+        retranslateUi(PhraseBookBox);
+
+        QMetaObject::connectSlotsByName(PhraseBookBox);
+    } // setupUi
+
+    void retranslateUi(QDialog *PhraseBookBox)
+    {
+        PhraseBookBox->setWindowTitle(QApplication::translate("PhraseBookBox", "Edit Phrase Book", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        PhraseBookBox->setWhatsThis(QApplication::translate("PhraseBookBox", "This window allows you to add, modify, or delete phrases in a phrase book.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        target->setText(QApplication::translate("PhraseBookBox", "&Translation:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        targetLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the target language corresponding to the source phrase.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        source->setText(QApplication::translate("PhraseBookBox", "S&ource phrase:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        definitionLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is a definition for the source phrase.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+#ifndef QT_NO_WHATSTHIS
+        sourceLed->setWhatsThis(QApplication::translate("PhraseBookBox", "This is the phrase in the source language.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        definition->setText(QApplication::translate("PhraseBookBox", "&Definition:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        newBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to add the phrase to the phrase book.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        newBut->setText(QApplication::translate("PhraseBookBox", "&New Phrase", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        removeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to remove the phrase from the phrase book.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        removeBut->setText(QApplication::translate("PhraseBookBox", "&Remove Phrase", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        saveBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to save the changes made.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        saveBut->setText(QApplication::translate("PhraseBookBox", "&Save", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        closeBut->setWhatsThis(QApplication::translate("PhraseBookBox", "Click here to close this window.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        closeBut->setText(QApplication::translate("PhraseBookBox", "Close", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PhraseBookBox);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PhraseBookBox: public Ui_PhraseBookBox {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PHRASEBOOKBOX_H
diff --git a/tests/auto/uic/baseline/plugindialog.ui b/tests/auto/uic/baseline/plugindialog.ui
new file mode 100644
index 0000000..3de4270
--- /dev/null
+++ b/tests/auto/uic/baseline/plugindialog.ui
@@ -0,0 +1,152 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>PluginDialog</class>
+ <widget class="QDialog" name="PluginDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>401</width>
+    <height>331</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Plugin Information</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <property name="leftMargin" >
+    <number>8</number>
+   </property>
+   <property name="topMargin" >
+    <number>8</number>
+   </property>
+   <property name="rightMargin" >
+    <number>8</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>8</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>TextLabel</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTreeWidget" name="treeWidget" >
+     <property name="textElideMode" >
+      <enum>Qt::ElideNone</enum>
+     </property>
+     <column>
+      <property name="text" >
+       <string>1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="message" >
+     <property name="text" >
+      <string>TextLabel</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PluginDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>154</x>
+     <y>307</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>401</x>
+     <y>280</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/plugindialog.ui.h b/tests/auto/uic/baseline/plugindialog.ui.h
new file mode 100644
index 0000000..bb51f4a
--- /dev/null
+++ b/tests/auto/uic/baseline/plugindialog.ui.h
@@ -0,0 +1,145 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'plugindialog.ui'
+**
+** Created: Mon Jun 16 17:52:32 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PLUGINDIALOG_H
+#define PLUGINDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PluginDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QLabel *label;
+    QTreeWidget *treeWidget;
+    QLabel *message;
+    QHBoxLayout *hboxLayout;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *PluginDialog)
+    {
+        if (PluginDialog->objectName().isEmpty())
+            PluginDialog->setObjectName(QString::fromUtf8("PluginDialog"));
+        PluginDialog->resize(401, 331);
+        vboxLayout = new QVBoxLayout(PluginDialog);
+        vboxLayout->setSpacing(6);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setContentsMargins(8, 8, 8, 8);
+        label = new QLabel(PluginDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setWordWrap(true);
+
+        vboxLayout->addWidget(label);
+
+        treeWidget = new QTreeWidget(PluginDialog);
+        treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
+        treeWidget->setTextElideMode(Qt::ElideNone);
+
+        vboxLayout->addWidget(treeWidget);
+
+        message = new QLabel(PluginDialog);
+        message->setObjectName(QString::fromUtf8("message"));
+        message->setWordWrap(true);
+
+        vboxLayout->addWidget(message);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setSpacing(6);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
+
+        vboxLayout->addLayout(hboxLayout);
+
+        buttonBox = new QDialogButtonBox(PluginDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Close);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(PluginDialog);
+        QObject::connect(buttonBox, SIGNAL(rejected()), PluginDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(PluginDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *PluginDialog)
+    {
+        PluginDialog->setWindowTitle(QApplication::translate("PluginDialog", "Plugin Information", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("PluginDialog", "TextLabel", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", 0, QApplication::UnicodeUTF8));
+        message->setText(QApplication::translate("PluginDialog", "TextLabel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PluginDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PluginDialog: public Ui_PluginDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PLUGINDIALOG_H
diff --git a/tests/auto/uic/baseline/preferencesdialog.ui b/tests/auto/uic/baseline/preferencesdialog.ui
new file mode 100644
index 0000000..3092fcb
--- /dev/null
+++ b/tests/auto/uic/baseline/preferencesdialog.ui
@@ -0,0 +1,165 @@
+<ui version="4.0" >
+ <class>PreferencesDialog</class>
+ <widget class="QDialog" name="PreferencesDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>455</width>
+    <height>359</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Preferences</string>
+  </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QGroupBox" name="m_uiModeGroupBox" >
+         <property name="title" >
+          <string>User Interface Mode</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <item>
+           <widget class="QComboBox" name="m_uiModeCombo" />
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="FontPanel" name="m_fontPanel" />
+       </item>
+       <item>
+        <widget class="qdesigner_internal::PreviewConfigurationWidget" name="m_previewConfigurationWidget" />
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QGroupBox" name="m_templatePathGroupBox" >
+         <property name="title" >
+          <string>Additional Template Paths</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" colspan="3" >
+           <widget class="QListWidget" name="m_templatePathListWidget" />
+          </item>
+          <item row="1" column="0" >
+           <widget class="QToolButton" name="m_addTemplatePathButton" >
+            <property name="text" >
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QToolButton" name="m_removeTemplatePathButton" >
+            <property name="text" >
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="qdesigner_internal::GridPanel" name="m_gridPanel" />
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="m_dialogButtonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>FontPanel</class>
+   <extends>QGroupBox</extends>
+   <header>fontpanel.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>qdesigner_internal::GridPanel</class>
+   <extends>QGroupBox</extends>
+   <header>gridpanel_p.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>qdesigner_internal::PreviewConfigurationWidget</class>
+   <extends>QGroupBox</extends>
+   <header location="global" >previewconfigurationwidget_p.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>m_dialogButtonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PreferencesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>m_dialogButtonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PreferencesDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/preferencesdialog.ui.h b/tests/auto/uic/baseline/preferencesdialog.ui.h
new file mode 100644
index 0000000..5412fe1
--- /dev/null
+++ b/tests/auto/uic/baseline/preferencesdialog.ui.h
@@ -0,0 +1,173 @@
+/********************************************************************************
+** Form generated from reading ui file 'preferencesdialog.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PREFERENCESDIALOG_H
+#define PREFERENCESDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include <previewconfigurationwidget_p.h>
+#include "fontpanel.h"
+#include "gridpanel_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PreferencesDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QVBoxLayout *vboxLayout1;
+    QGroupBox *m_uiModeGroupBox;
+    QVBoxLayout *vboxLayout2;
+    QComboBox *m_uiModeCombo;
+    FontPanel *m_fontPanel;
+    qdesigner_internal::PreviewConfigurationWidget *m_previewConfigurationWidget;
+    QVBoxLayout *vboxLayout3;
+    QGroupBox *m_templatePathGroupBox;
+    QGridLayout *gridLayout;
+    QListWidget *m_templatePathListWidget;
+    QToolButton *m_addTemplatePathButton;
+    QToolButton *m_removeTemplatePathButton;
+    QSpacerItem *spacerItem;
+    qdesigner_internal::GridPanel *m_gridPanel;
+    QFrame *line;
+    QDialogButtonBox *m_dialogButtonBox;
+
+    void setupUi(QDialog *PreferencesDialog)
+    {
+        if (PreferencesDialog->objectName().isEmpty())
+            PreferencesDialog->setObjectName(QString::fromUtf8("PreferencesDialog"));
+        PreferencesDialog->resize(455, 359);
+        PreferencesDialog->setModal(true);
+        vboxLayout = new QVBoxLayout(PreferencesDialog);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        vboxLayout1 = new QVBoxLayout();
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        m_uiModeGroupBox = new QGroupBox(PreferencesDialog);
+        m_uiModeGroupBox->setObjectName(QString::fromUtf8("m_uiModeGroupBox"));
+        vboxLayout2 = new QVBoxLayout(m_uiModeGroupBox);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        m_uiModeCombo = new QComboBox(m_uiModeGroupBox);
+        m_uiModeCombo->setObjectName(QString::fromUtf8("m_uiModeCombo"));
+
+        vboxLayout2->addWidget(m_uiModeCombo);
+
+
+        vboxLayout1->addWidget(m_uiModeGroupBox);
+
+        m_fontPanel = new FontPanel(PreferencesDialog);
+        m_fontPanel->setObjectName(QString::fromUtf8("m_fontPanel"));
+
+        vboxLayout1->addWidget(m_fontPanel);
+
+        m_previewConfigurationWidget = new qdesigner_internal::PreviewConfigurationWidget(PreferencesDialog);
+        m_previewConfigurationWidget->setObjectName(QString::fromUtf8("m_previewConfigurationWidget"));
+
+        vboxLayout1->addWidget(m_previewConfigurationWidget);
+
+
+        hboxLayout->addLayout(vboxLayout1);
+
+        vboxLayout3 = new QVBoxLayout();
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        m_templatePathGroupBox = new QGroupBox(PreferencesDialog);
+        m_templatePathGroupBox->setObjectName(QString::fromUtf8("m_templatePathGroupBox"));
+        gridLayout = new QGridLayout(m_templatePathGroupBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        m_templatePathListWidget = new QListWidget(m_templatePathGroupBox);
+        m_templatePathListWidget->setObjectName(QString::fromUtf8("m_templatePathListWidget"));
+
+        gridLayout->addWidget(m_templatePathListWidget, 0, 0, 1, 3);
+
+        m_addTemplatePathButton = new QToolButton(m_templatePathGroupBox);
+        m_addTemplatePathButton->setObjectName(QString::fromUtf8("m_addTemplatePathButton"));
+
+        gridLayout->addWidget(m_addTemplatePathButton, 1, 0, 1, 1);
+
+        m_removeTemplatePathButton = new QToolButton(m_templatePathGroupBox);
+        m_removeTemplatePathButton->setObjectName(QString::fromUtf8("m_removeTemplatePathButton"));
+
+        gridLayout->addWidget(m_removeTemplatePathButton, 1, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 1, 2, 1, 1);
+
+
+        vboxLayout3->addWidget(m_templatePathGroupBox);
+
+        m_gridPanel = new qdesigner_internal::GridPanel(PreferencesDialog);
+        m_gridPanel->setObjectName(QString::fromUtf8("m_gridPanel"));
+
+        vboxLayout3->addWidget(m_gridPanel);
+
+
+        hboxLayout->addLayout(vboxLayout3);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        line = new QFrame(PreferencesDialog);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        vboxLayout->addWidget(line);
+
+        m_dialogButtonBox = new QDialogButtonBox(PreferencesDialog);
+        m_dialogButtonBox->setObjectName(QString::fromUtf8("m_dialogButtonBox"));
+        m_dialogButtonBox->setOrientation(Qt::Horizontal);
+        m_dialogButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(m_dialogButtonBox);
+
+
+        retranslateUi(PreferencesDialog);
+        QObject::connect(m_dialogButtonBox, SIGNAL(accepted()), PreferencesDialog, SLOT(accept()));
+        QObject::connect(m_dialogButtonBox, SIGNAL(rejected()), PreferencesDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(PreferencesDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *PreferencesDialog)
+    {
+        PreferencesDialog->setWindowTitle(QApplication::translate("PreferencesDialog", "Preferences", 0, QApplication::UnicodeUTF8));
+        m_uiModeGroupBox->setTitle(QApplication::translate("PreferencesDialog", "User Interface Mode", 0, QApplication::UnicodeUTF8));
+        m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", 0, QApplication::UnicodeUTF8));
+        m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0, QApplication::UnicodeUTF8));
+        m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PreferencesDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PreferencesDialog: public Ui_PreferencesDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PREFERENCESDIALOG_H
diff --git a/tests/auto/uic/baseline/previewconfigurationwidget.ui b/tests/auto/uic/baseline/previewconfigurationwidget.ui
new file mode 100644
index 0000000..2f18766
--- /dev/null
+++ b/tests/auto/uic/baseline/previewconfigurationwidget.ui
@@ -0,0 +1,91 @@
+<ui version="4.0" >
+ <class>PreviewConfigurationWidget</class>
+ <widget class="QGroupBox" name="PreviewConfigurationWidget" >
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <property name="title" >
+   <string>Print/Preview Configuration</string>
+  </property>
+  <property name="checkable" >
+   <bool>true</bool>
+  </property>
+  <layout class="QFormLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="m_styleLabel" >
+     <property name="text" >
+      <string>Style</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="m_styleCombo" />
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="m_appStyleSheetLabel" >
+     <property name="text" >
+      <string>Style sheet</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="qdesigner_internal::TextPropertyEditor" name="m_appStyleSheetLineEdit" >
+       <property name="minimumSize" >
+        <size>
+         <width>149</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="m_appStyleSheetChangeButton" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="m_appStyleSheetClearButton" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="m_skinLabel" >
+     <property name="text" >
+      <string>Device skin</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QComboBox" name="m_skinCombo" />
+     </item>
+     <item>
+      <widget class="QToolButton" name="m_skinRemoveButton" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qdesigner_internal::TextPropertyEditor</class>
+   <extends>QLineEdit</extends>
+   <header location="global" >textpropertyeditor_p.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
new file mode 100644
index 0000000..6d5247d
--- /dev/null
+++ b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
@@ -0,0 +1,134 @@
+/********************************************************************************
+** Form generated from reading ui file 'previewconfigurationwidget.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PREVIEWCONFIGURATIONWIDGET_H
+#define PREVIEWCONFIGURATIONWIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QToolButton>
+#include <textpropertyeditor_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PreviewConfigurationWidget
+{
+public:
+    QFormLayout *formLayout;
+    QLabel *m_styleLabel;
+    QComboBox *m_styleCombo;
+    QLabel *m_appStyleSheetLabel;
+    QHBoxLayout *hboxLayout;
+    qdesigner_internal::TextPropertyEditor *m_appStyleSheetLineEdit;
+    QToolButton *m_appStyleSheetChangeButton;
+    QToolButton *m_appStyleSheetClearButton;
+    QLabel *m_skinLabel;
+    QHBoxLayout *hboxLayout1;
+    QComboBox *m_skinCombo;
+    QToolButton *m_skinRemoveButton;
+
+    void setupUi(QGroupBox *PreviewConfigurationWidget)
+    {
+        if (PreviewConfigurationWidget->objectName().isEmpty())
+            PreviewConfigurationWidget->setObjectName(QString::fromUtf8("PreviewConfigurationWidget"));
+        PreviewConfigurationWidget->setCheckable(true);
+        formLayout = new QFormLayout(PreviewConfigurationWidget);
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
+        m_styleLabel = new QLabel(PreviewConfigurationWidget);
+        m_styleLabel->setObjectName(QString::fromUtf8("m_styleLabel"));
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, m_styleLabel);
+
+        m_styleCombo = new QComboBox(PreviewConfigurationWidget);
+        m_styleCombo->setObjectName(QString::fromUtf8("m_styleCombo"));
+
+        formLayout->setWidget(0, QFormLayout::FieldRole, m_styleCombo);
+
+        m_appStyleSheetLabel = new QLabel(PreviewConfigurationWidget);
+        m_appStyleSheetLabel->setObjectName(QString::fromUtf8("m_appStyleSheetLabel"));
+
+        formLayout->setWidget(1, QFormLayout::LabelRole, m_appStyleSheetLabel);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        m_appStyleSheetLineEdit = new qdesigner_internal::TextPropertyEditor(PreviewConfigurationWidget);
+        m_appStyleSheetLineEdit->setObjectName(QString::fromUtf8("m_appStyleSheetLineEdit"));
+        m_appStyleSheetLineEdit->setMinimumSize(QSize(149, 0));
+
+        hboxLayout->addWidget(m_appStyleSheetLineEdit);
+
+        m_appStyleSheetChangeButton = new QToolButton(PreviewConfigurationWidget);
+        m_appStyleSheetChangeButton->setObjectName(QString::fromUtf8("m_appStyleSheetChangeButton"));
+
+        hboxLayout->addWidget(m_appStyleSheetChangeButton);
+
+        m_appStyleSheetClearButton = new QToolButton(PreviewConfigurationWidget);
+        m_appStyleSheetClearButton->setObjectName(QString::fromUtf8("m_appStyleSheetClearButton"));
+
+        hboxLayout->addWidget(m_appStyleSheetClearButton);
+
+
+        formLayout->setLayout(1, QFormLayout::FieldRole, hboxLayout);
+
+        m_skinLabel = new QLabel(PreviewConfigurationWidget);
+        m_skinLabel->setObjectName(QString::fromUtf8("m_skinLabel"));
+
+        formLayout->setWidget(2, QFormLayout::LabelRole, m_skinLabel);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        m_skinCombo = new QComboBox(PreviewConfigurationWidget);
+        m_skinCombo->setObjectName(QString::fromUtf8("m_skinCombo"));
+
+        hboxLayout1->addWidget(m_skinCombo);
+
+        m_skinRemoveButton = new QToolButton(PreviewConfigurationWidget);
+        m_skinRemoveButton->setObjectName(QString::fromUtf8("m_skinRemoveButton"));
+
+        hboxLayout1->addWidget(m_skinRemoveButton);
+
+
+        formLayout->setLayout(2, QFormLayout::FieldRole, hboxLayout1);
+
+
+        retranslateUi(PreviewConfigurationWidget);
+
+        QMetaObject::connectSlotsByName(PreviewConfigurationWidget);
+    } // setupUi
+
+    void retranslateUi(QGroupBox *PreviewConfigurationWidget)
+    {
+        PreviewConfigurationWidget->setWindowTitle(QApplication::translate("PreviewConfigurationWidget", "Form", 0, QApplication::UnicodeUTF8));
+        PreviewConfigurationWidget->setTitle(QApplication::translate("PreviewConfigurationWidget", "Print/Preview Configuration", 0, QApplication::UnicodeUTF8));
+        m_styleLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style", 0, QApplication::UnicodeUTF8));
+        m_appStyleSheetLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Style sheet", 0, QApplication::UnicodeUTF8));
+        m_appStyleSheetChangeButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0, QApplication::UnicodeUTF8));
+        m_appStyleSheetClearButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0, QApplication::UnicodeUTF8));
+        m_skinLabel->setText(QApplication::translate("PreviewConfigurationWidget", "Device skin", 0, QApplication::UnicodeUTF8));
+        m_skinRemoveButton->setText(QApplication::translate("PreviewConfigurationWidget", "...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PreviewConfigurationWidget);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PreviewConfigurationWidget: public Ui_PreviewConfigurationWidget {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PREVIEWCONFIGURATIONWIDGET_H
diff --git a/tests/auto/uic/baseline/previewdialogbase.ui b/tests/auto/uic/baseline/previewdialogbase.ui
new file mode 100644
index 0000000..593ee33
--- /dev/null
+++ b/tests/auto/uic/baseline/previewdialogbase.ui
@@ -0,0 +1,224 @@
+<ui version="4.0" >
+ <class>PreviewDialogBase</class>
+ <widget class="QDialog" name="PreviewDialogBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>733</width>
+    <height>479</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Print Preview</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>&amp;Paper Size:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>paperSizeCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="paperSizeCombo" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>&amp;Orientation:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>paperOrientationCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="paperOrientationCombo" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QTreeWidget" name="pageList" >
+       <property name="indentation" >
+        <number>0</number>
+       </property>
+       <property name="rootIsDecorated" >
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights" >
+        <bool>true</bool>
+       </property>
+       <property name="itemsExpandable" >
+        <bool>false</bool>
+       </property>
+       <property name="columnCount" >
+        <number>1</number>
+       </property>
+       <column>
+        <property name="text" >
+         <string>1</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QScrollArea" native="1" name="previewArea" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>5</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QProgressBar" name="progressBar" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="value" >
+        <number>0</number>
+       </property>
+       <property name="textVisible" >
+        <bool>false</bool>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QScrollArea</class>
+   <extends>QWidget</extends>
+   <header>qscrollarea.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PreviewDialogBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>696</x>
+     <y>526</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>677</x>
+     <y>446</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PreviewDialogBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>587</x>
+     <y>529</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>547</x>
+     <y>448</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/previewdialogbase.ui.h b/tests/auto/uic/baseline/previewdialogbase.ui.h
new file mode 100644
index 0000000..af65a18
--- /dev/null
+++ b/tests/auto/uic/baseline/previewdialogbase.ui.h
@@ -0,0 +1,192 @@
+/********************************************************************************
+** Form generated from reading ui file 'previewdialogbase.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PREVIEWDIALOGBASE_H
+#define PREVIEWDIALOGBASE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtGui/QScrollArea>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PreviewDialogBase
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QLabel *label;
+    QComboBox *paperSizeCombo;
+    QLabel *label_2;
+    QComboBox *paperOrientationCombo;
+    QSpacerItem *spacerItem;
+    QHBoxLayout *hboxLayout1;
+    QTreeWidget *pageList;
+    QScrollArea *previewArea;
+    QHBoxLayout *hboxLayout2;
+    QProgressBar *progressBar;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *PreviewDialogBase)
+    {
+        if (PreviewDialogBase->objectName().isEmpty())
+            PreviewDialogBase->setObjectName(QString::fromUtf8("PreviewDialogBase"));
+        PreviewDialogBase->resize(733, 479);
+        vboxLayout = new QVBoxLayout(PreviewDialogBase);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(0);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        label = new QLabel(PreviewDialogBase);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        hboxLayout->addWidget(label);
+
+        paperSizeCombo = new QComboBox(PreviewDialogBase);
+        paperSizeCombo->setObjectName(QString::fromUtf8("paperSizeCombo"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(paperSizeCombo->sizePolicy().hasHeightForWidth());
+        paperSizeCombo->setSizePolicy(sizePolicy);
+
+        hboxLayout->addWidget(paperSizeCombo);
+
+        label_2 = new QLabel(PreviewDialogBase);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        hboxLayout->addWidget(label_2);
+
+        paperOrientationCombo = new QComboBox(PreviewDialogBase);
+        paperOrientationCombo->setObjectName(QString::fromUtf8("paperOrientationCombo"));
+        sizePolicy.setHeightForWidth(paperOrientationCombo->sizePolicy().hasHeightForWidth());
+        paperOrientationCombo->setSizePolicy(sizePolicy);
+
+        hboxLayout->addWidget(paperOrientationCombo);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        pageList = new QTreeWidget(PreviewDialogBase);
+        pageList->setObjectName(QString::fromUtf8("pageList"));
+        pageList->setIndentation(0);
+        pageList->setRootIsDecorated(false);
+        pageList->setUniformRowHeights(true);
+        pageList->setItemsExpandable(false);
+        pageList->setColumnCount(1);
+
+        hboxLayout1->addWidget(pageList);
+
+        previewArea = new QScrollArea(PreviewDialogBase);
+        previewArea->setObjectName(QString::fromUtf8("previewArea"));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(5));
+        sizePolicy1.setHorizontalStretch(1);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(previewArea->sizePolicy().hasHeightForWidth());
+        previewArea->setSizePolicy(sizePolicy1);
+
+        hboxLayout1->addWidget(previewArea);
+
+
+        vboxLayout->addLayout(hboxLayout1);
+
+        hboxLayout2 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout2->setSpacing(6);
+#endif
+        hboxLayout2->setMargin(0);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        progressBar = new QProgressBar(PreviewDialogBase);
+        progressBar->setObjectName(QString::fromUtf8("progressBar"));
+        progressBar->setEnabled(false);
+        QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy2.setHorizontalStretch(1);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(progressBar->sizePolicy().hasHeightForWidth());
+        progressBar->setSizePolicy(sizePolicy2);
+        progressBar->setValue(0);
+        progressBar->setTextVisible(false);
+        progressBar->setOrientation(Qt::Horizontal);
+
+        hboxLayout2->addWidget(progressBar);
+
+        buttonBox = new QDialogButtonBox(PreviewDialogBase);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        hboxLayout2->addWidget(buttonBox);
+
+
+        vboxLayout->addLayout(hboxLayout2);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(paperSizeCombo);
+        label_2->setBuddy(paperOrientationCombo);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(PreviewDialogBase);
+        QObject::connect(buttonBox, SIGNAL(accepted()), PreviewDialogBase, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), PreviewDialogBase, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(PreviewDialogBase);
+    } // setupUi
+
+    void retranslateUi(QDialog *PreviewDialogBase)
+    {
+        PreviewDialogBase->setWindowTitle(QApplication::translate("PreviewDialogBase", "Print Preview", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("PreviewDialogBase", "&Paper Size:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("PreviewDialogBase", "&Orientation:", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = pageList->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("PreviewDialogBase", "1", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PreviewDialogBase);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PreviewDialogBase: public Ui_PreviewDialogBase {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PREVIEWDIALOGBASE_H
diff --git a/tests/auto/uic/baseline/previewwidget.ui b/tests/auto/uic/baseline/previewwidget.ui
new file mode 100644
index 0000000..d77004a
--- /dev/null
+++ b/tests/auto/uic/baseline/previewwidget.ui
@@ -0,0 +1,237 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::PreviewWidget</class>
+ <widget class="QWidget" name="qdesigner_internal::PreviewWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>471</width>
+    <height>251</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>1</hsizetype>
+    <vsizetype>1</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Preview Window</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="3" row="0" column="1" >
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLineEdit" name="LineEdit1" >
+       <property name="text" >
+        <string>LineEdit</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="ComboBox1" >
+       <item>
+        <property name="text" >
+         <string>ComboBox</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QSpinBox" name="SpinBox1" />
+       </item>
+       <item>
+        <widget class="QPushButton" name="PushButton1" >
+         <property name="text" >
+          <string>PushButton</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QScrollBar" name="ScrollBar1" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSlider" name="Slider1" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QListWidget" name="listWidget" >
+       <property name="maximumSize" >
+        <size>
+         <width>32767</width>
+         <height>50</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QProgressBar" name="ProgressBar1" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QGroupBox" name="ButtonGroup2" >
+     <property name="title" >
+      <string>ButtonGroup2</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="CheckBox1" >
+        <property name="text" >
+         <string>CheckBox1</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="CheckBox2" >
+        <property name="text" >
+         <string>CheckBox2</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="ButtonGroup1" >
+     <property name="title" >
+      <string>ButtonGroup</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QRadioButton" name="RadioButton1" >
+        <property name="text" >
+         <string>RadioButton1</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton2" >
+        <property name="text" >
+         <string>RadioButton2</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton3" >
+        <property name="text" >
+         <string>RadioButton3</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/uic/baseline/previewwidget.ui.h
new file mode 100644
index 0000000..71755df
--- /dev/null
+++ b/tests/auto/uic/baseline/previewwidget.ui.h
@@ -0,0 +1,282 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'previewwidget.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PREVIEWWIDGET_H
+#define PREVIEWWIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListWidget>
+#include <QtGui/QProgressBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
+#include <QtGui/QScrollBar>
+#include <QtGui/QSlider>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_PreviewWidget
+{
+public:
+    QGridLayout *gridLayout;
+    QVBoxLayout *vboxLayout;
+    QLineEdit *LineEdit1;
+    QComboBox *ComboBox1;
+    QHBoxLayout *hboxLayout;
+    QSpinBox *SpinBox1;
+    QPushButton *PushButton1;
+    QScrollBar *ScrollBar1;
+    QSlider *Slider1;
+    QListWidget *listWidget;
+    QSpacerItem *spacerItem;
+    QProgressBar *ProgressBar1;
+    QGroupBox *ButtonGroup2;
+    QVBoxLayout *vboxLayout1;
+    QCheckBox *CheckBox1;
+    QCheckBox *CheckBox2;
+    QGroupBox *ButtonGroup1;
+    QVBoxLayout *vboxLayout2;
+    QRadioButton *RadioButton1;
+    QRadioButton *RadioButton2;
+    QRadioButton *RadioButton3;
+
+    void setupUi(QWidget *qdesigner_internal__PreviewWidget)
+    {
+        if (qdesigner_internal__PreviewWidget->objectName().isEmpty())
+            qdesigner_internal__PreviewWidget->setObjectName(QString::fromUtf8("qdesigner_internal__PreviewWidget"));
+        qdesigner_internal__PreviewWidget->resize(471, 251);
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(1));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(qdesigner_internal__PreviewWidget->sizePolicy().hasHeightForWidth());
+        qdesigner_internal__PreviewWidget->setSizePolicy(sizePolicy);
+        gridLayout = new QGridLayout(qdesigner_internal__PreviewWidget);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        vboxLayout = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(0);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        LineEdit1 = new QLineEdit(qdesigner_internal__PreviewWidget);
+        LineEdit1->setObjectName(QString::fromUtf8("LineEdit1"));
+
+        vboxLayout->addWidget(LineEdit1);
+
+        ComboBox1 = new QComboBox(qdesigner_internal__PreviewWidget);
+        ComboBox1->setObjectName(QString::fromUtf8("ComboBox1"));
+
+        vboxLayout->addWidget(ComboBox1);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        SpinBox1 = new QSpinBox(qdesigner_internal__PreviewWidget);
+        SpinBox1->setObjectName(QString::fromUtf8("SpinBox1"));
+
+        hboxLayout->addWidget(SpinBox1);
+
+        PushButton1 = new QPushButton(qdesigner_internal__PreviewWidget);
+        PushButton1->setObjectName(QString::fromUtf8("PushButton1"));
+
+        hboxLayout->addWidget(PushButton1);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        ScrollBar1 = new QScrollBar(qdesigner_internal__PreviewWidget);
+        ScrollBar1->setObjectName(QString::fromUtf8("ScrollBar1"));
+        ScrollBar1->setOrientation(Qt::Horizontal);
+
+        vboxLayout->addWidget(ScrollBar1);
+
+        Slider1 = new QSlider(qdesigner_internal__PreviewWidget);
+        Slider1->setObjectName(QString::fromUtf8("Slider1"));
+        Slider1->setOrientation(Qt::Horizontal);
+
+        vboxLayout->addWidget(Slider1);
+
+        listWidget = new QListWidget(qdesigner_internal__PreviewWidget);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+        listWidget->setMaximumSize(QSize(32767, 50));
+
+        vboxLayout->addWidget(listWidget);
+
+
+        gridLayout->addLayout(vboxLayout, 0, 1, 3, 1);
+
+        spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(spacerItem, 3, 0, 1, 2);
+
+        ProgressBar1 = new QProgressBar(qdesigner_internal__PreviewWidget);
+        ProgressBar1->setObjectName(QString::fromUtf8("ProgressBar1"));
+        ProgressBar1->setOrientation(Qt::Horizontal);
+
+        gridLayout->addWidget(ProgressBar1, 2, 0, 1, 1);
+
+        ButtonGroup2 = new QGroupBox(qdesigner_internal__PreviewWidget);
+        ButtonGroup2->setObjectName(QString::fromUtf8("ButtonGroup2"));
+        vboxLayout1 = new QVBoxLayout(ButtonGroup2);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(9);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        CheckBox1 = new QCheckBox(ButtonGroup2);
+        CheckBox1->setObjectName(QString::fromUtf8("CheckBox1"));
+        CheckBox1->setChecked(true);
+
+        vboxLayout1->addWidget(CheckBox1);
+
+        CheckBox2 = new QCheckBox(ButtonGroup2);
+        CheckBox2->setObjectName(QString::fromUtf8("CheckBox2"));
+
+        vboxLayout1->addWidget(CheckBox2);
+
+
+        gridLayout->addWidget(ButtonGroup2, 1, 0, 1, 1);
+
+        ButtonGroup1 = new QGroupBox(qdesigner_internal__PreviewWidget);
+        ButtonGroup1->setObjectName(QString::fromUtf8("ButtonGroup1"));
+        vboxLayout2 = new QVBoxLayout(ButtonGroup1);
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout2->setMargin(9);
+#endif
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        RadioButton1 = new QRadioButton(ButtonGroup1);
+        RadioButton1->setObjectName(QString::fromUtf8("RadioButton1"));
+        RadioButton1->setChecked(true);
+
+        vboxLayout2->addWidget(RadioButton1);
+
+        RadioButton2 = new QRadioButton(ButtonGroup1);
+        RadioButton2->setObjectName(QString::fromUtf8("RadioButton2"));
+
+        vboxLayout2->addWidget(RadioButton2);
+
+        RadioButton3 = new QRadioButton(ButtonGroup1);
+        RadioButton3->setObjectName(QString::fromUtf8("RadioButton3"));
+
+        vboxLayout2->addWidget(RadioButton3);
+
+
+        gridLayout->addWidget(ButtonGroup1, 0, 0, 1, 1);
+
+
+        retranslateUi(qdesigner_internal__PreviewWidget);
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__PreviewWidget);
+    } // setupUi
+
+    void retranslateUi(QWidget *qdesigner_internal__PreviewWidget)
+    {
+        qdesigner_internal__PreviewWidget->setWindowTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "Preview Window", 0, QApplication::UnicodeUTF8));
+        LineEdit1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "LineEdit", 0, QApplication::UnicodeUTF8));
+        ComboBox1->clear();
+        ComboBox1->insertItems(0, QStringList()
+         << QApplication::translate("qdesigner_internal::PreviewWidget", "ComboBox", 0, QApplication::UnicodeUTF8)
+        );
+        PushButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "PushButton", 0, QApplication::UnicodeUTF8));
+        ButtonGroup2->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup2", 0, QApplication::UnicodeUTF8));
+        CheckBox1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox1", 0, QApplication::UnicodeUTF8));
+        CheckBox2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "CheckBox2", 0, QApplication::UnicodeUTF8));
+        ButtonGroup1->setTitle(QApplication::translate("qdesigner_internal::PreviewWidget", "ButtonGroup", 0, QApplication::UnicodeUTF8));
+        RadioButton1->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton1", 0, QApplication::UnicodeUTF8));
+        RadioButton2->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton2", 0, QApplication::UnicodeUTF8));
+        RadioButton3->setText(QApplication::translate("qdesigner_internal::PreviewWidget", "RadioButton3", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__PreviewWidget);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class PreviewWidget: public Ui_PreviewWidget {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // PREVIEWWIDGET_H
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui b/tests/auto/uic/baseline/previewwidgetbase.ui
new file mode 100644
index 0000000..247c86d
--- /dev/null
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui
@@ -0,0 +1,339 @@
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+  <exportmacro></exportmacro>
+  <class>PreviewWidgetBase</class>
+  <widget class="QWidget" name="PreviewWidgetBase" >
+    <property name="objectName" >
+      <string notr="true" >PreviewWidgetBase</string>
+    </property>
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>378</width>
+        <height>236</height>
+      </rect>
+    </property>
+    <property name="sizePolicy" >
+      <sizepolicy>
+        <hsizetype>1</hsizetype>
+        <vsizetype>1</vsizetype>
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+      </sizepolicy>
+    </property>
+    <property name="windowTitle" >
+      <string>Preview Window</string>
+    </property>
+    <layout class="QVBoxLayout" >
+      <property name="objectName" >
+        <string notr="true" >unnamed</string>
+      </property>
+      <property name="margin" >
+        <number>11</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item>
+        <layout class="QHBoxLayout" >
+          <property name="objectName" >
+            <string notr="true" >unnamed</string>
+          </property>
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <layout class="QVBoxLayout" >
+              <property name="objectName" >
+                <string notr="true" >unnamed</string>
+              </property>
+              <property name="margin" >
+                <number>0</number>
+              </property>
+              <property name="spacing" >
+                <number>6</number>
+              </property>
+              <item>
+                <widget class="Q3ButtonGroup" name="ButtonGroup1" >
+                  <property name="objectName" >
+                    <string notr="true" >ButtonGroup1</string>
+                  </property>
+                  <property name="title" >
+                    <string>ButtonGroup</string>
+                  </property>
+                  <layout class="QVBoxLayout" >
+                    <property name="objectName" >
+                      <string notr="true" >unnamed</string>
+                    </property>
+                    <property name="margin" >
+                      <number>11</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item>
+                      <widget class="QRadioButton" name="RadioButton1" >
+                        <property name="objectName" >
+                          <string notr="true" >RadioButton1</string>
+                        </property>
+                        <property name="text" >
+                          <string>RadioButton1</string>
+                        </property>
+                        <property name="checked" >
+                          <bool>true</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item>
+                      <widget class="QRadioButton" name="RadioButton2" >
+                        <property name="objectName" >
+                          <string notr="true" >RadioButton2</string>
+                        </property>
+                        <property name="text" >
+                          <string>RadioButton2</string>
+                        </property>
+                      </widget>
+                    </item>
+                    <item>
+                      <widget class="QRadioButton" name="RadioButton3" >
+                        <property name="objectName" >
+                          <string notr="true" >RadioButton3</string>
+                        </property>
+                        <property name="text" >
+                          <string>RadioButton3</string>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </widget>
+              </item>
+              <item>
+                <widget class="Q3ButtonGroup" name="ButtonGroup2" >
+                  <property name="objectName" >
+                    <string notr="true" >ButtonGroup2</string>
+                  </property>
+                  <property name="title" >
+                    <string>ButtonGroup2</string>
+                  </property>
+                  <layout class="QVBoxLayout" >
+                    <property name="objectName" >
+                      <string notr="true" >unnamed</string>
+                    </property>
+                    <property name="margin" >
+                      <number>11</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item>
+                      <widget class="QCheckBox" name="CheckBox1" >
+                        <property name="objectName" >
+                          <string notr="true" >CheckBox1</string>
+                        </property>
+                        <property name="text" >
+                          <string>CheckBox1</string>
+                        </property>
+                        <property name="checked" >
+                          <bool>true</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item>
+                      <widget class="QCheckBox" name="CheckBox2" >
+                        <property name="objectName" >
+                          <string notr="true" >CheckBox2</string>
+                        </property>
+                        <property name="text" >
+                          <string>CheckBox2</string>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </widget>
+              </item>
+              <item>
+                <widget class="QProgressBar" name="ProgressBar1" >
+                  <property name="objectName" >
+                    <string notr="true" >ProgressBar1</string>
+                  </property>
+                  <property name="value" >
+                    <number>50</number>
+                  </property>
+                </widget>
+              </item>
+            </layout>
+          </item>
+          <item>
+            <layout class="QVBoxLayout" >
+              <property name="objectName" >
+                <string notr="true" >unnamed</string>
+              </property>
+              <property name="margin" >
+                <number>0</number>
+              </property>
+              <property name="spacing" >
+                <number>6</number>
+              </property>
+              <item>
+                <widget class="QLineEdit" name="LineEdit1" >
+                  <property name="objectName" >
+                    <string notr="true" >LineEdit1</string>
+                  </property>
+                  <property name="text" >
+                    <string>LineEdit</string>
+                  </property>
+                </widget>
+              </item>
+              <item>
+                <widget class="QComboBox" name="ComboBox1" >
+                  <property name="objectName" >
+                    <string notr="true" >ComboBox1</string>
+                  </property>
+                  <item>
+                    <property name="text" >
+                      <string>ComboBox</string>
+                    </property>
+                  </item>
+                </widget>
+              </item>
+              <item>
+                <layout class="QHBoxLayout" >
+                  <property name="objectName" >
+                    <string notr="true" >unnamed</string>
+                  </property>
+                  <property name="margin" >
+                    <number>0</number>
+                  </property>
+                  <property name="spacing" >
+                    <number>6</number>
+                  </property>
+                  <item>
+                    <widget class="QSpinBox" name="SpinBox1" >
+                      <property name="objectName" >
+                        <string notr="true" >SpinBox1</string>
+                      </property>
+                    </widget>
+                  </item>
+                  <item>
+                    <widget class="QPushButton" name="PushButton1" >
+                      <property name="objectName" >
+                        <string notr="true" >PushButton1</string>
+                      </property>
+                      <property name="text" >
+                        <string>PushButton</string>
+                      </property>
+                    </widget>
+                  </item>
+                </layout>
+              </item>
+              <item>
+                <widget class="QScrollBar" name="ScrollBar1" >
+                  <property name="objectName" >
+                    <string notr="true" >ScrollBar1</string>
+                  </property>
+                  <property name="orientation" >
+                    <enum>Qt::Horizontal</enum>
+                  </property>
+                </widget>
+              </item>
+              <item>
+                <widget class="QSlider" name="Slider1" >
+                  <property name="objectName" >
+                    <string notr="true" >Slider1</string>
+                  </property>
+                  <property name="orientation" >
+                    <enum>Qt::Horizontal</enum>
+                  </property>
+                </widget>
+              </item>
+              <item>
+                <widget class="QTextEdit" name="textView" >
+                  <property name="objectName" >
+                    <string notr="true" >textView</string>
+                  </property>
+                  <property name="maximumSize" >
+                    <size>
+                      <width>32767</width>
+                      <height>50</height>
+                    </size>
+                  </property>
+                  <property name="readOnly" >
+                    <bool>true</bool>
+                  </property>
+                  <property name="text" >
+                    <string>&lt;p>
+&lt;a href=&quot;http://www.trolltech.com&quot;>http://www.trolltech.com&lt;/a>
+&lt;/p>
+&lt;p>
+&lt;a href=&quot;http://www.kde.org&quot;>http://www.kde.org&lt;/a>
+&lt;/p></string>
+                  </property>
+                </widget>
+              </item>
+            </layout>
+          </item>
+        </layout>
+      </item>
+      <item>
+        <spacer name="Spacer2" >
+          <property name="sizeHint" >
+            <size>
+              <width>20</width>
+              <height>20</height>
+            </size>
+          </property>
+          <property name="sizeType" >
+            <enum>Expanding</enum>
+          </property>
+          <property name="orientation" >
+            <enum>Vertical</enum>
+          </property>
+        </spacer>
+      </item>
+    </layout>
+  </widget>
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui.h b/tests/auto/uic/baseline/previewwidgetbase.ui.h
new file mode 100644
index 0000000..f69a785
--- /dev/null
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui.h
@@ -0,0 +1,316 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'previewwidgetbase.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PREVIEWWIDGETBASE_H
+#define PREVIEWWIDGETBASE_H
+
+#include <Qt3Support/Q3ButtonGroup>
+#include <Qt3Support/Q3MimeSourceFactory>
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLineEdit>
+#include <QtGui/QProgressBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
+#include <QtGui/QScrollBar>
+#include <QtGui/QSlider>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_PreviewWidgetBase
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QVBoxLayout *vboxLayout1;
+    Q3ButtonGroup *ButtonGroup1;
+    QVBoxLayout *vboxLayout2;
+    QRadioButton *RadioButton1;
+    QRadioButton *RadioButton2;
+    QRadioButton *RadioButton3;
+    Q3ButtonGroup *ButtonGroup2;
+    QVBoxLayout *vboxLayout3;
+    QCheckBox *CheckBox1;
+    QCheckBox *CheckBox2;
+    QProgressBar *ProgressBar1;
+    QVBoxLayout *vboxLayout4;
+    QLineEdit *LineEdit1;
+    QComboBox *ComboBox1;
+    QHBoxLayout *hboxLayout1;
+    QSpinBox *SpinBox1;
+    QPushButton *PushButton1;
+    QScrollBar *ScrollBar1;
+    QSlider *Slider1;
+    QTextEdit *textView;
+    QSpacerItem *Spacer2;
+
+    void setupUi(QWidget *PreviewWidgetBase)
+    {
+        if (PreviewWidgetBase->objectName().isEmpty())
+            PreviewWidgetBase->setObjectName(QString::fromUtf8("PreviewWidgetBase"));
+        PreviewWidgetBase->resize(378, 236);
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(1));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(PreviewWidgetBase->sizePolicy().hasHeightForWidth());
+        PreviewWidgetBase->setSizePolicy(sizePolicy);
+        vboxLayout = new QVBoxLayout(PreviewWidgetBase);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(11);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("unnamed"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(0);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
+        vboxLayout1 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(0);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
+        ButtonGroup1 = new Q3ButtonGroup(PreviewWidgetBase);
+        ButtonGroup1->setObjectName(QString::fromUtf8("ButtonGroup1"));
+        ButtonGroup1->setColumnLayout(0, Qt::Vertical);
+#ifndef Q_OS_MAC
+        ButtonGroup1->layout()->setSpacing(6);
+#endif
+        ButtonGroup1->layout()->setMargin(11);
+        vboxLayout2 = new QVBoxLayout();
+        QBoxLayout *boxlayout = qobject_cast<QBoxLayout *>(ButtonGroup1->layout());
+        if (boxlayout)
+            boxlayout->addLayout(vboxLayout2);
+        vboxLayout2->setAlignment(Qt::AlignTop);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setObjectName(QString::fromUtf8("unnamed"));
+        RadioButton1 = new QRadioButton(ButtonGroup1);
+        RadioButton1->setObjectName(QString::fromUtf8("RadioButton1"));
+        RadioButton1->setChecked(true);
+
+        vboxLayout2->addWidget(RadioButton1);
+
+        RadioButton2 = new QRadioButton(ButtonGroup1);
+        RadioButton2->setObjectName(QString::fromUtf8("RadioButton2"));
+
+        vboxLayout2->addWidget(RadioButton2);
+
+        RadioButton3 = new QRadioButton(ButtonGroup1);
+        RadioButton3->setObjectName(QString::fromUtf8("RadioButton3"));
+
+        vboxLayout2->addWidget(RadioButton3);
+
+
+        vboxLayout1->addWidget(ButtonGroup1);
+
+        ButtonGroup2 = new Q3ButtonGroup(PreviewWidgetBase);
+        ButtonGroup2->setObjectName(QString::fromUtf8("ButtonGroup2"));
+        ButtonGroup2->setColumnLayout(0, Qt::Vertical);
+#ifndef Q_OS_MAC
+        ButtonGroup2->layout()->setSpacing(6);
+#endif
+        ButtonGroup2->layout()->setMargin(11);
+        vboxLayout3 = new QVBoxLayout();
+        QBoxLayout *boxlayout1 = qobject_cast<QBoxLayout *>(ButtonGroup2->layout());
+        if (boxlayout1)
+            boxlayout1->addLayout(vboxLayout3);
+        vboxLayout3->setAlignment(Qt::AlignTop);
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        vboxLayout3->setObjectName(QString::fromUtf8("unnamed"));
+        CheckBox1 = new QCheckBox(ButtonGroup2);
+        CheckBox1->setObjectName(QString::fromUtf8("CheckBox1"));
+        CheckBox1->setChecked(true);
+
+        vboxLayout3->addWidget(CheckBox1);
+
+        CheckBox2 = new QCheckBox(ButtonGroup2);
+        CheckBox2->setObjectName(QString::fromUtf8("CheckBox2"));
+
+        vboxLayout3->addWidget(CheckBox2);
+
+
+        vboxLayout1->addWidget(ButtonGroup2);
+
+        ProgressBar1 = new QProgressBar(PreviewWidgetBase);
+        ProgressBar1->setObjectName(QString::fromUtf8("ProgressBar1"));
+        ProgressBar1->setValue(50);
+
+        vboxLayout1->addWidget(ProgressBar1);
+
+
+        hboxLayout->addLayout(vboxLayout1);
+
+        vboxLayout4 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout4->setSpacing(6);
+#endif
+        vboxLayout4->setMargin(0);
+        vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
+        vboxLayout4->setObjectName(QString::fromUtf8("unnamed"));
+        LineEdit1 = new QLineEdit(PreviewWidgetBase);
+        LineEdit1->setObjectName(QString::fromUtf8("LineEdit1"));
+
+        vboxLayout4->addWidget(LineEdit1);
+
+        ComboBox1 = new QComboBox(PreviewWidgetBase);
+        ComboBox1->setObjectName(QString::fromUtf8("ComboBox1"));
+
+        vboxLayout4->addWidget(ComboBox1);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        hboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
+        SpinBox1 = new QSpinBox(PreviewWidgetBase);
+        SpinBox1->setObjectName(QString::fromUtf8("SpinBox1"));
+
+        hboxLayout1->addWidget(SpinBox1);
+
+        PushButton1 = new QPushButton(PreviewWidgetBase);
+        PushButton1->setObjectName(QString::fromUtf8("PushButton1"));
+
+        hboxLayout1->addWidget(PushButton1);
+
+
+        vboxLayout4->addLayout(hboxLayout1);
+
+        ScrollBar1 = new QScrollBar(PreviewWidgetBase);
+        ScrollBar1->setObjectName(QString::fromUtf8("ScrollBar1"));
+        ScrollBar1->setOrientation(Qt::Horizontal);
+
+        vboxLayout4->addWidget(ScrollBar1);
+
+        Slider1 = new QSlider(PreviewWidgetBase);
+        Slider1->setObjectName(QString::fromUtf8("Slider1"));
+        Slider1->setOrientation(Qt::Horizontal);
+
+        vboxLayout4->addWidget(Slider1);
+
+        textView = new QTextEdit(PreviewWidgetBase);
+        textView->setObjectName(QString::fromUtf8("textView"));
+        textView->setMaximumSize(QSize(32767, 50));
+        textView->setReadOnly(true);
+
+        vboxLayout4->addWidget(textView);
+
+
+        hboxLayout->addLayout(vboxLayout4);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        Spacer2 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(Spacer2);
+
+
+        retranslateUi(PreviewWidgetBase);
+
+        QMetaObject::connectSlotsByName(PreviewWidgetBase);
+    } // setupUi
+
+    void retranslateUi(QWidget *PreviewWidgetBase)
+    {
+        PreviewWidgetBase->setWindowTitle(QApplication::translate("PreviewWidgetBase", "Preview Window", 0, QApplication::UnicodeUTF8));
+        ButtonGroup1->setTitle(QApplication::translate("PreviewWidgetBase", "ButtonGroup", 0, QApplication::UnicodeUTF8));
+        RadioButton1->setText(QApplication::translate("PreviewWidgetBase", "RadioButton1", 0, QApplication::UnicodeUTF8));
+        RadioButton2->setText(QApplication::translate("PreviewWidgetBase", "RadioButton2", 0, QApplication::UnicodeUTF8));
+        RadioButton3->setText(QApplication::translate("PreviewWidgetBase", "RadioButton3", 0, QApplication::UnicodeUTF8));
+        ButtonGroup2->setTitle(QApplication::translate("PreviewWidgetBase", "ButtonGroup2", 0, QApplication::UnicodeUTF8));
+        CheckBox1->setText(QApplication::translate("PreviewWidgetBase", "CheckBox1", 0, QApplication::UnicodeUTF8));
+        CheckBox2->setText(QApplication::translate("PreviewWidgetBase", "CheckBox2", 0, QApplication::UnicodeUTF8));
+        LineEdit1->setText(QApplication::translate("PreviewWidgetBase", "LineEdit", 0, QApplication::UnicodeUTF8));
+        ComboBox1->clear();
+        ComboBox1->insertItems(0, QStringList()
+         << QApplication::translate("PreviewWidgetBase", "ComboBox", 0, QApplication::UnicodeUTF8)
+        );
+        PushButton1->setText(QApplication::translate("PreviewWidgetBase", "PushButton", 0, QApplication::UnicodeUTF8));
+        textView->setText(QApplication::translate("PreviewWidgetBase", "<p>\n"
+"<a href=\"http://www.trolltech.com\">http://www.trolltech.com</a>\n"
+"</p>\n"
+"<p>\n"
+"<a href=\"http://www.kde.org\">http://www.kde.org</a>\n"
+"</p>", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(PreviewWidgetBase);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class PreviewWidgetBase: public Ui_PreviewWidgetBase {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PREVIEWWIDGETBASE_H
diff --git a/tests/auto/uic/baseline/proxy.ui b/tests/auto/uic/baseline/proxy.ui
new file mode 100644
index 0000000..62a8be6
--- /dev/null
+++ b/tests/auto/uic/baseline/proxy.ui
@@ -0,0 +1,104 @@
+<ui version="4.0" >
+ <class>ProxyDialog</class>
+ <widget class="QDialog" name="ProxyDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>369</width>
+    <height>144</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Proxy Authentication</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="iconLabel" >
+     <property name="text" >
+      <string>ICON</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLabel" name="introLabel" >
+     <property name="text" >
+      <string>Connect to proxy</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QLabel" name="usernameLabel" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QLineEdit" name="userNameLineEdit" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QLabel" name="passwordLabel" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QLineEdit" name="passwordLineEdit" >
+     <property name="echoMode" >
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/proxy.ui.h b/tests/auto/uic/baseline/proxy.ui.h
new file mode 100644
index 0000000..2ec63fa
--- /dev/null
+++ b/tests/auto/uic/baseline/proxy.ui.h
@@ -0,0 +1,110 @@
+/********************************************************************************
+** Form generated from reading ui file 'proxy.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef PROXY_H
+#define PROXY_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_ProxyDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *iconLabel;
+    QLabel *introLabel;
+    QLabel *usernameLabel;
+    QLineEdit *userNameLineEdit;
+    QLabel *passwordLabel;
+    QLineEdit *passwordLineEdit;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *ProxyDialog)
+    {
+        if (ProxyDialog->objectName().isEmpty())
+            ProxyDialog->setObjectName(QString::fromUtf8("ProxyDialog"));
+        ProxyDialog->resize(369, 144);
+        gridLayout = new QGridLayout(ProxyDialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        iconLabel = new QLabel(ProxyDialog);
+        iconLabel->setObjectName(QString::fromUtf8("iconLabel"));
+
+        gridLayout->addWidget(iconLabel, 0, 0, 1, 1);
+
+        introLabel = new QLabel(ProxyDialog);
+        introLabel->setObjectName(QString::fromUtf8("introLabel"));
+        introLabel->setWordWrap(true);
+
+        gridLayout->addWidget(introLabel, 0, 1, 1, 2);
+
+        usernameLabel = new QLabel(ProxyDialog);
+        usernameLabel->setObjectName(QString::fromUtf8("usernameLabel"));
+
+        gridLayout->addWidget(usernameLabel, 1, 0, 1, 2);
+
+        userNameLineEdit = new QLineEdit(ProxyDialog);
+        userNameLineEdit->setObjectName(QString::fromUtf8("userNameLineEdit"));
+
+        gridLayout->addWidget(userNameLineEdit, 1, 2, 1, 1);
+
+        passwordLabel = new QLabel(ProxyDialog);
+        passwordLabel->setObjectName(QString::fromUtf8("passwordLabel"));
+
+        gridLayout->addWidget(passwordLabel, 2, 0, 1, 2);
+
+        passwordLineEdit = new QLineEdit(ProxyDialog);
+        passwordLineEdit->setObjectName(QString::fromUtf8("passwordLineEdit"));
+        passwordLineEdit->setEchoMode(QLineEdit::Password);
+
+        gridLayout->addWidget(passwordLineEdit, 2, 2, 1, 1);
+
+        buttonBox = new QDialogButtonBox(ProxyDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 3, 0, 1, 3);
+
+
+        retranslateUi(ProxyDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), ProxyDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), ProxyDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(ProxyDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *ProxyDialog)
+    {
+        ProxyDialog->setWindowTitle(QApplication::translate("ProxyDialog", "Proxy Authentication", 0, QApplication::UnicodeUTF8));
+        iconLabel->setText(QApplication::translate("ProxyDialog", "ICON", 0, QApplication::UnicodeUTF8));
+        introLabel->setText(QApplication::translate("ProxyDialog", "Connect to proxy", 0, QApplication::UnicodeUTF8));
+        usernameLabel->setText(QApplication::translate("ProxyDialog", "Username:", 0, QApplication::UnicodeUTF8));
+        passwordLabel->setText(QApplication::translate("ProxyDialog", "Password:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(ProxyDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class ProxyDialog: public Ui_ProxyDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // PROXY_H
diff --git a/tests/auto/uic/baseline/qfiledialog.ui b/tests/auto/uic/baseline/qfiledialog.ui
new file mode 100644
index 0000000..44e6b7f
--- /dev/null
+++ b/tests/auto/uic/baseline/qfiledialog.ui
@@ -0,0 +1,319 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>QFileDialog</class>
+ <widget class="QDialog" name="QFileDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>521</width>
+    <height>316</height>
+   </rect>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="lookInLabel" >
+     <property name="text" >
+      <string>Look in:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QFileDialogComboBox" name="lookInCombo" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Ignored" >
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>50</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="backButton" >
+       <property name="toolTip" >
+        <string>Back</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="forwardButton" >
+       <property name="toolTip" >
+        <string>Forward</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toParentButton" >
+       <property name="toolTip" >
+        <string>Parent Directory</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="newFolderButton" >
+       <property name="toolTip" >
+        <string>Create New Folder</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="listModeButton" >
+       <property name="toolTip" >
+        <string>List View</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="detailModeButton" >
+       <property name="toolTip" >
+        <string>Detail View</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="QSplitter" name="splitter" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QSidebar" name="sidebar" />
+     <widget class="QFrame" name="frame" >
+      <property name="frameShape" >
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="frameShadow" >
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QVBoxLayout" >
+       <property name="spacing" >
+        <number>0</number>
+       </property>
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QStackedWidget" name="stackedWidget" >
+         <property name="currentIndex" >
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="page" >
+          <layout class="QVBoxLayout" >
+           <property name="spacing" >
+            <number>0</number>
+           </property>
+           <property name="leftMargin" >
+            <number>0</number>
+           </property>
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QFileDialogListView" name="listView" />
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="page_2" >
+          <layout class="QVBoxLayout" >
+           <property name="spacing" >
+            <number>0</number>
+           </property>
+           <property name="leftMargin" >
+            <number>0</number>
+           </property>
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QFileDialogTreeView" name="treeView" />
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="fileNameLabel" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QFileDialogLineEdit" name="fileNameEdit" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item rowspan="2" row="2" column="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="fileTypeLabel" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Files of type:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QComboBox" name="fileTypeCombo" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QFileDialogTreeView</class>
+   <extends>QTreeView</extends>
+   <header>qfiledialog_p.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QFileDialogListView</class>
+   <extends>QListView</extends>
+   <header>qfiledialog_p.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QSidebar</class>
+   <extends>QListWidget</extends>
+   <header>qsidebar_p.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QFileDialogLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>qfiledialog_p.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QFileDialogComboBox</class>
+   <extends>QComboBox</extends>
+   <header>qfiledialog_p.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>lookInCombo</tabstop>
+  <tabstop>backButton</tabstop>
+  <tabstop>forwardButton</tabstop>
+  <tabstop>toParentButton</tabstop>
+  <tabstop>newFolderButton</tabstop>
+  <tabstop>listModeButton</tabstop>
+  <tabstop>detailModeButton</tabstop>
+  <tabstop>sidebar</tabstop>
+  <tabstop>listView</tabstop>
+  <tabstop>fileNameEdit</tabstop>
+  <tabstop>fileTypeCombo</tabstop>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>treeView</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qfiledialog.ui.h b/tests/auto/uic/baseline/qfiledialog.ui.h
new file mode 100644
index 0000000..3b3a626
--- /dev/null
+++ b/tests/auto/uic/baseline/qfiledialog.ui.h
@@ -0,0 +1,320 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'qfiledialog.ui'
+**
+** Created: Mon Jun 16 17:51:48 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QFILEDIALOG_H
+#define QFILEDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QSplitter>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "qfiledialog_p.h"
+#include "qsidebar_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QFileDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QLabel *lookInLabel;
+    QHBoxLayout *hboxLayout;
+    QFileDialogComboBox *lookInCombo;
+    QToolButton *backButton;
+    QToolButton *forwardButton;
+    QToolButton *toParentButton;
+    QToolButton *newFolderButton;
+    QToolButton *listModeButton;
+    QToolButton *detailModeButton;
+    QSplitter *splitter;
+    QSidebar *sidebar;
+    QFrame *frame;
+    QVBoxLayout *vboxLayout;
+    QStackedWidget *stackedWidget;
+    QWidget *page;
+    QVBoxLayout *vboxLayout1;
+    QFileDialogListView *listView;
+    QWidget *page_2;
+    QVBoxLayout *vboxLayout2;
+    QFileDialogTreeView *treeView;
+    QLabel *fileNameLabel;
+    QFileDialogLineEdit *fileNameEdit;
+    QDialogButtonBox *buttonBox;
+    QLabel *fileTypeLabel;
+    QComboBox *fileTypeCombo;
+
+    void setupUi(QDialog *QFileDialog)
+    {
+        if (QFileDialog->objectName().isEmpty())
+            QFileDialog->setObjectName(QString::fromUtf8("QFileDialog"));
+        QFileDialog->resize(521, 316);
+        QFileDialog->setSizeGripEnabled(true);
+        gridLayout = new QGridLayout(QFileDialog);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        lookInLabel = new QLabel(QFileDialog);
+        lookInLabel->setObjectName(QString::fromUtf8("lookInLabel"));
+
+        gridLayout->addWidget(lookInLabel, 0, 0, 1, 1);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        lookInCombo = new QFileDialogComboBox(QFileDialog);
+        lookInCombo->setObjectName(QString::fromUtf8("lookInCombo"));
+        QSizePolicy sizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(1);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(lookInCombo->sizePolicy().hasHeightForWidth());
+        lookInCombo->setSizePolicy(sizePolicy);
+        lookInCombo->setMinimumSize(QSize(50, 0));
+
+        hboxLayout->addWidget(lookInCombo);
+
+        backButton = new QToolButton(QFileDialog);
+        backButton->setObjectName(QString::fromUtf8("backButton"));
+
+        hboxLayout->addWidget(backButton);
+
+        forwardButton = new QToolButton(QFileDialog);
+        forwardButton->setObjectName(QString::fromUtf8("forwardButton"));
+
+        hboxLayout->addWidget(forwardButton);
+
+        toParentButton = new QToolButton(QFileDialog);
+        toParentButton->setObjectName(QString::fromUtf8("toParentButton"));
+
+        hboxLayout->addWidget(toParentButton);
+
+        newFolderButton = new QToolButton(QFileDialog);
+        newFolderButton->setObjectName(QString::fromUtf8("newFolderButton"));
+
+        hboxLayout->addWidget(newFolderButton);
+
+        listModeButton = new QToolButton(QFileDialog);
+        listModeButton->setObjectName(QString::fromUtf8("listModeButton"));
+
+        hboxLayout->addWidget(listModeButton);
+
+        detailModeButton = new QToolButton(QFileDialog);
+        detailModeButton->setObjectName(QString::fromUtf8("detailModeButton"));
+
+        hboxLayout->addWidget(detailModeButton);
+
+
+        gridLayout->addLayout(hboxLayout, 0, 1, 1, 2);
+
+        splitter = new QSplitter(QFileDialog);
+        splitter->setObjectName(QString::fromUtf8("splitter"));
+        QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(splitter->sizePolicy().hasHeightForWidth());
+        splitter->setSizePolicy(sizePolicy1);
+        splitter->setOrientation(Qt::Horizontal);
+        sidebar = new QSidebar(splitter);
+        sidebar->setObjectName(QString::fromUtf8("sidebar"));
+        splitter->addWidget(sidebar);
+        frame = new QFrame(splitter);
+        frame->setObjectName(QString::fromUtf8("frame"));
+        frame->setFrameShape(QFrame::NoFrame);
+        frame->setFrameShadow(QFrame::Raised);
+        vboxLayout = new QVBoxLayout(frame);
+        vboxLayout->setSpacing(0);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
+        stackedWidget = new QStackedWidget(frame);
+        stackedWidget->setObjectName(QString::fromUtf8("stackedWidget"));
+        page = new QWidget();
+        page->setObjectName(QString::fromUtf8("page"));
+        vboxLayout1 = new QVBoxLayout(page);
+        vboxLayout1->setSpacing(0);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
+        listView = new QFileDialogListView(page);
+        listView->setObjectName(QString::fromUtf8("listView"));
+
+        vboxLayout1->addWidget(listView);
+
+        stackedWidget->addWidget(page);
+        page_2 = new QWidget();
+        page_2->setObjectName(QString::fromUtf8("page_2"));
+        vboxLayout2 = new QVBoxLayout(page_2);
+        vboxLayout2->setSpacing(0);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
+        treeView = new QFileDialogTreeView(page_2);
+        treeView->setObjectName(QString::fromUtf8("treeView"));
+
+        vboxLayout2->addWidget(treeView);
+
+        stackedWidget->addWidget(page_2);
+
+        vboxLayout->addWidget(stackedWidget);
+
+        splitter->addWidget(frame);
+
+        gridLayout->addWidget(splitter, 1, 0, 1, 3);
+
+        fileNameLabel = new QLabel(QFileDialog);
+        fileNameLabel->setObjectName(QString::fromUtf8("fileNameLabel"));
+        QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Preferred);
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(fileNameLabel->sizePolicy().hasHeightForWidth());
+        fileNameLabel->setSizePolicy(sizePolicy2);
+        fileNameLabel->setMinimumSize(QSize(0, 0));
+
+        gridLayout->addWidget(fileNameLabel, 2, 0, 1, 1);
+
+        fileNameEdit = new QFileDialogLineEdit(QFileDialog);
+        fileNameEdit->setObjectName(QString::fromUtf8("fileNameEdit"));
+        QSizePolicy sizePolicy3(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        sizePolicy3.setHorizontalStretch(1);
+        sizePolicy3.setVerticalStretch(0);
+        sizePolicy3.setHeightForWidth(fileNameEdit->sizePolicy().hasHeightForWidth());
+        fileNameEdit->setSizePolicy(sizePolicy3);
+
+        gridLayout->addWidget(fileNameEdit, 2, 1, 1, 1);
+
+        buttonBox = new QDialogButtonBox(QFileDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Vertical);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        gridLayout->addWidget(buttonBox, 2, 2, 2, 1);
+
+        fileTypeLabel = new QLabel(QFileDialog);
+        fileTypeLabel->setObjectName(QString::fromUtf8("fileTypeLabel"));
+        QSizePolicy sizePolicy4(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy4.setHorizontalStretch(0);
+        sizePolicy4.setVerticalStretch(0);
+        sizePolicy4.setHeightForWidth(fileTypeLabel->sizePolicy().hasHeightForWidth());
+        fileTypeLabel->setSizePolicy(sizePolicy4);
+
+        gridLayout->addWidget(fileTypeLabel, 3, 0, 1, 1);
+
+        fileTypeCombo = new QComboBox(QFileDialog);
+        fileTypeCombo->setObjectName(QString::fromUtf8("fileTypeCombo"));
+        QSizePolicy sizePolicy5(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        sizePolicy5.setHorizontalStretch(0);
+        sizePolicy5.setVerticalStretch(0);
+        sizePolicy5.setHeightForWidth(fileTypeCombo->sizePolicy().hasHeightForWidth());
+        fileTypeCombo->setSizePolicy(sizePolicy5);
+
+        gridLayout->addWidget(fileTypeCombo, 3, 1, 1, 1);
+
+        QWidget::setTabOrder(lookInCombo, backButton);
+        QWidget::setTabOrder(backButton, forwardButton);
+        QWidget::setTabOrder(forwardButton, toParentButton);
+        QWidget::setTabOrder(toParentButton, newFolderButton);
+        QWidget::setTabOrder(newFolderButton, listModeButton);
+        QWidget::setTabOrder(listModeButton, detailModeButton);
+        QWidget::setTabOrder(detailModeButton, sidebar);
+        QWidget::setTabOrder(sidebar, listView);
+        QWidget::setTabOrder(listView, fileNameEdit);
+        QWidget::setTabOrder(fileNameEdit, fileTypeCombo);
+        QWidget::setTabOrder(fileTypeCombo, buttonBox);
+        QWidget::setTabOrder(buttonBox, treeView);
+
+        retranslateUi(QFileDialog);
+
+        stackedWidget->setCurrentIndex(0);
+
+
+        QMetaObject::connectSlotsByName(QFileDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *QFileDialog)
+    {
+        lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        backButton->setToolTip(QApplication::translate("QFileDialog", "Back", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QFileDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QFileDialog: public Ui_QFileDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QFILEDIALOG_H
diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui b/tests/auto/uic/baseline/qpagesetupwidget.ui
new file mode 100644
index 0000000..ace2ab8
--- /dev/null
+++ b/tests/auto/uic/baseline/qpagesetupwidget.ui
@@ -0,0 +1,353 @@
+<ui version="4.0" >
+ <class>QPageSetupWidget</class>
+ <widget class="QWidget" name="QPageSetupWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>416</width>
+    <height>488</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" colspan="2" >
+    <layout class="QHBoxLayout" name="horizontalLayout_4" >
+     <item>
+      <widget class="QComboBox" name="unit" />
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Paper</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="pageSizeLabel" >
+        <property name="text" >
+         <string>Page size:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>paperSize</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="paperSize" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="widthLabel" >
+        <property name="text" >
+         <string>Width:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>paperWidth</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <layout class="QHBoxLayout" name="horizontalLayout_3" >
+        <item>
+         <widget class="QDoubleSpinBox" name="paperWidth" >
+          <property name="maximum" >
+           <double>9999.989999999999782</double>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="heightLabel" >
+          <property name="text" >
+           <string>Height:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>paperHeight</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QDoubleSpinBox" name="paperHeight" >
+          <property name="maximum" >
+           <double>9999.989999999999782</double>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="paperSourceLabel" >
+        <property name="text" >
+         <string>Paper source:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>paperSource</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QComboBox" name="paperSource" />
+      </item>
+      <item row="1" column="2" >
+       <spacer name="horizontalSpacer_4" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="title" >
+      <string>Orientation</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout" >
+      <item>
+       <widget class="QRadioButton" name="portrait" >
+        <property name="text" >
+         <string>Portrait</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="landscape" >
+        <property name="text" >
+         <string>Landscape</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="reverseLandscape" >
+        <property name="text" >
+         <string>Reverse landscape</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="reversePortrait" >
+        <property name="text" >
+         <string>Reverse portrait</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_5" >
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item rowspan="2" row="2" column="1" >
+    <widget class="QWidget" native="1" name="preview" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Margins</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2" >
+      <item>
+       <layout class="QGridLayout" name="gridLayout" >
+        <item row="0" column="1" >
+         <widget class="QDoubleSpinBox" name="topMargin" >
+          <property name="toolTip" >
+           <string>top margin</string>
+          </property>
+          <property name="accessibleName" >
+           <string>top margin</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="maximum" >
+           <double>999.990000000000009</double>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" colspan="3" >
+         <layout class="QHBoxLayout" name="horizontalLayout" >
+          <item>
+           <spacer name="horizontalSpacer_7" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>0</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="leftMargin" >
+            <property name="toolTip" >
+             <string>left margin</string>
+            </property>
+            <property name="accessibleName" >
+             <string>left margin</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="maximum" >
+             <double>999.990000000000009</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::MinimumExpanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="rightMargin" >
+            <property name="toolTip" >
+             <string>right margin</string>
+            </property>
+            <property name="accessibleName" >
+             <string>right margin</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="maximum" >
+             <double>999.990000000000009</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_8" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>0</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item row="2" column="1" >
+         <widget class="QDoubleSpinBox" name="bottomMargin" >
+          <property name="toolTip" >
+           <string>bottom margin</string>
+          </property>
+          <property name="accessibleName" >
+           <string>bottom margin</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="maximum" >
+           <double>999.990000000000009</double>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2" >
+         <spacer name="horizontalSpacer_2" >
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType" >
+           <enum>QSizePolicy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>0</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="0" >
+         <spacer name="horizontalSpacer_5" >
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType" >
+           <enum>QSizePolicy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>0</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0" >
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
new file mode 100644
index 0000000..628a8eb
--- /dev/null
+++ b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
@@ -0,0 +1,320 @@
+/********************************************************************************
+** Form generated from reading ui file 'qpagesetupwidget.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QPAGESETUPWIDGET_H
+#define QPAGESETUPWIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDoubleSpinBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QPageSetupWidget
+{
+public:
+    QGridLayout *gridLayout_3;
+    QHBoxLayout *horizontalLayout_4;
+    QComboBox *unit;
+    QSpacerItem *horizontalSpacer_3;
+    QGroupBox *groupBox_2;
+    QGridLayout *gridLayout_2;
+    QLabel *pageSizeLabel;
+    QComboBox *paperSize;
+    QLabel *widthLabel;
+    QHBoxLayout *horizontalLayout_3;
+    QDoubleSpinBox *paperWidth;
+    QLabel *heightLabel;
+    QDoubleSpinBox *paperHeight;
+    QLabel *paperSourceLabel;
+    QComboBox *paperSource;
+    QSpacerItem *horizontalSpacer_4;
+    QGroupBox *groupBox_3;
+    QVBoxLayout *verticalLayout;
+    QRadioButton *portrait;
+    QRadioButton *landscape;
+    QRadioButton *reverseLandscape;
+    QRadioButton *reversePortrait;
+    QSpacerItem *verticalSpacer_5;
+    QWidget *preview;
+    QGroupBox *groupBox;
+    QHBoxLayout *horizontalLayout_2;
+    QGridLayout *gridLayout;
+    QDoubleSpinBox *topMargin;
+    QHBoxLayout *horizontalLayout;
+    QSpacerItem *horizontalSpacer_7;
+    QDoubleSpinBox *leftMargin;
+    QSpacerItem *horizontalSpacer;
+    QDoubleSpinBox *rightMargin;
+    QSpacerItem *horizontalSpacer_8;
+    QDoubleSpinBox *bottomMargin;
+    QSpacerItem *horizontalSpacer_2;
+    QSpacerItem *horizontalSpacer_5;
+    QSpacerItem *verticalSpacer;
+
+    void setupUi(QWidget *QPageSetupWidget)
+    {
+        if (QPageSetupWidget->objectName().isEmpty())
+            QPageSetupWidget->setObjectName(QString::fromUtf8("QPageSetupWidget"));
+        QPageSetupWidget->resize(416, 488);
+        gridLayout_3 = new QGridLayout(QPageSetupWidget);
+        gridLayout_3->setMargin(0);
+        gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
+        horizontalLayout_4 = new QHBoxLayout();
+        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
+        unit = new QComboBox(QPageSetupWidget);
+        unit->setObjectName(QString::fromUtf8("unit"));
+
+        horizontalLayout_4->addWidget(unit);
+
+        horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_4->addItem(horizontalSpacer_3);
+
+
+        gridLayout_3->addLayout(horizontalLayout_4, 0, 0, 1, 2);
+
+        groupBox_2 = new QGroupBox(QPageSetupWidget);
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        gridLayout_2 = new QGridLayout(groupBox_2);
+        gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+        pageSizeLabel = new QLabel(groupBox_2);
+        pageSizeLabel->setObjectName(QString::fromUtf8("pageSizeLabel"));
+
+        gridLayout_2->addWidget(pageSizeLabel, 0, 0, 1, 1);
+
+        paperSize = new QComboBox(groupBox_2);
+        paperSize->setObjectName(QString::fromUtf8("paperSize"));
+
+        gridLayout_2->addWidget(paperSize, 0, 1, 1, 1);
+
+        widthLabel = new QLabel(groupBox_2);
+        widthLabel->setObjectName(QString::fromUtf8("widthLabel"));
+
+        gridLayout_2->addWidget(widthLabel, 1, 0, 1, 1);
+
+        horizontalLayout_3 = new QHBoxLayout();
+        horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
+        paperWidth = new QDoubleSpinBox(groupBox_2);
+        paperWidth->setObjectName(QString::fromUtf8("paperWidth"));
+        paperWidth->setMaximum(9999.99);
+
+        horizontalLayout_3->addWidget(paperWidth);
+
+        heightLabel = new QLabel(groupBox_2);
+        heightLabel->setObjectName(QString::fromUtf8("heightLabel"));
+
+        horizontalLayout_3->addWidget(heightLabel);
+
+        paperHeight = new QDoubleSpinBox(groupBox_2);
+        paperHeight->setObjectName(QString::fromUtf8("paperHeight"));
+        paperHeight->setMaximum(9999.99);
+
+        horizontalLayout_3->addWidget(paperHeight);
+
+
+        gridLayout_2->addLayout(horizontalLayout_3, 1, 1, 1, 1);
+
+        paperSourceLabel = new QLabel(groupBox_2);
+        paperSourceLabel->setObjectName(QString::fromUtf8("paperSourceLabel"));
+
+        gridLayout_2->addWidget(paperSourceLabel, 2, 0, 1, 1);
+
+        paperSource = new QComboBox(groupBox_2);
+        paperSource->setObjectName(QString::fromUtf8("paperSource"));
+
+        gridLayout_2->addWidget(paperSource, 2, 1, 1, 1);
+
+        horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout_2->addItem(horizontalSpacer_4, 1, 2, 1, 1);
+
+
+        gridLayout_3->addWidget(groupBox_2, 1, 0, 1, 2);
+
+        groupBox_3 = new QGroupBox(QPageSetupWidget);
+        groupBox_3->setObjectName(QString::fromUtf8("groupBox_3"));
+        verticalLayout = new QVBoxLayout(groupBox_3);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        portrait = new QRadioButton(groupBox_3);
+        portrait->setObjectName(QString::fromUtf8("portrait"));
+        portrait->setChecked(true);
+
+        verticalLayout->addWidget(portrait);
+
+        landscape = new QRadioButton(groupBox_3);
+        landscape->setObjectName(QString::fromUtf8("landscape"));
+
+        verticalLayout->addWidget(landscape);
+
+        reverseLandscape = new QRadioButton(groupBox_3);
+        reverseLandscape->setObjectName(QString::fromUtf8("reverseLandscape"));
+
+        verticalLayout->addWidget(reverseLandscape);
+
+        reversePortrait = new QRadioButton(groupBox_3);
+        reversePortrait->setObjectName(QString::fromUtf8("reversePortrait"));
+
+        verticalLayout->addWidget(reversePortrait);
+
+        verticalSpacer_5 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout->addItem(verticalSpacer_5);
+
+
+        gridLayout_3->addWidget(groupBox_3, 2, 0, 1, 1);
+
+        preview = new QWidget(QPageSetupWidget);
+        preview->setObjectName(QString::fromUtf8("preview"));
+
+        gridLayout_3->addWidget(preview, 2, 1, 2, 1);
+
+        groupBox = new QGroupBox(QPageSetupWidget);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        horizontalLayout_2 = new QHBoxLayout(groupBox);
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        gridLayout = new QGridLayout();
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        topMargin = new QDoubleSpinBox(groupBox);
+        topMargin->setObjectName(QString::fromUtf8("topMargin"));
+        topMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+        topMargin->setMaximum(999.99);
+
+        gridLayout->addWidget(topMargin, 0, 1, 1, 1);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        horizontalSpacer_7 = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(horizontalSpacer_7);
+
+        leftMargin = new QDoubleSpinBox(groupBox);
+        leftMargin->setObjectName(QString::fromUtf8("leftMargin"));
+        leftMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+        leftMargin->setMaximum(999.99);
+
+        horizontalLayout->addWidget(leftMargin);
+
+        horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(horizontalSpacer);
+
+        rightMargin = new QDoubleSpinBox(groupBox);
+        rightMargin->setObjectName(QString::fromUtf8("rightMargin"));
+        rightMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+        rightMargin->setMaximum(999.99);
+
+        horizontalLayout->addWidget(rightMargin);
+
+        horizontalSpacer_8 = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(horizontalSpacer_8);
+
+
+        gridLayout->addLayout(horizontalLayout, 1, 0, 1, 3);
+
+        bottomMargin = new QDoubleSpinBox(groupBox);
+        bottomMargin->setObjectName(QString::fromUtf8("bottomMargin"));
+        bottomMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+        bottomMargin->setMaximum(999.99);
+
+        gridLayout->addWidget(bottomMargin, 2, 1, 1, 1);
+
+        horizontalSpacer_2 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(horizontalSpacer_2, 0, 2, 1, 1);
+
+        horizontalSpacer_5 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(horizontalSpacer_5, 0, 0, 1, 1);
+
+
+        horizontalLayout_2->addLayout(gridLayout);
+
+
+        gridLayout_3->addWidget(groupBox, 3, 0, 1, 1);
+
+        verticalSpacer = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout_3->addItem(verticalSpacer, 4, 0, 1, 1);
+
+#ifndef QT_NO_SHORTCUT
+        pageSizeLabel->setBuddy(paperSize);
+        widthLabel->setBuddy(paperWidth);
+        heightLabel->setBuddy(paperHeight);
+        paperSourceLabel->setBuddy(paperSource);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(QPageSetupWidget);
+
+        QMetaObject::connectSlotsByName(QPageSetupWidget);
+    } // setupUi
+
+    void retranslateUi(QWidget *QPageSetupWidget)
+    {
+        QPageSetupWidget->setWindowTitle(QApplication::translate("QPageSetupWidget", "Form", 0, QApplication::UnicodeUTF8));
+        groupBox_2->setTitle(QApplication::translate("QPageSetupWidget", "Paper", 0, QApplication::UnicodeUTF8));
+        pageSizeLabel->setText(QApplication::translate("QPageSetupWidget", "Page size:", 0, QApplication::UnicodeUTF8));
+        widthLabel->setText(QApplication::translate("QPageSetupWidget", "Width:", 0, QApplication::UnicodeUTF8));
+        heightLabel->setText(QApplication::translate("QPageSetupWidget", "Height:", 0, QApplication::UnicodeUTF8));
+        paperSourceLabel->setText(QApplication::translate("QPageSetupWidget", "Paper source:", 0, QApplication::UnicodeUTF8));
+        groupBox_3->setTitle(QApplication::translate("QPageSetupWidget", "Orientation", 0, QApplication::UnicodeUTF8));
+        portrait->setText(QApplication::translate("QPageSetupWidget", "Portrait", 0, QApplication::UnicodeUTF8));
+        landscape->setText(QApplication::translate("QPageSetupWidget", "Landscape", 0, QApplication::UnicodeUTF8));
+        reverseLandscape->setText(QApplication::translate("QPageSetupWidget", "Reverse landscape", 0, QApplication::UnicodeUTF8));
+        reversePortrait->setText(QApplication::translate("QPageSetupWidget", "Reverse portrait", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("QPageSetupWidget", "Margins", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        topMargin->setToolTip(QApplication::translate("QPageSetupWidget", "top margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_ACCESSIBILITY
+        topMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "top margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_ACCESSIBILITY
+#ifndef QT_NO_TOOLTIP
+        leftMargin->setToolTip(QApplication::translate("QPageSetupWidget", "left margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_ACCESSIBILITY
+        leftMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "left margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_ACCESSIBILITY
+#ifndef QT_NO_TOOLTIP
+        rightMargin->setToolTip(QApplication::translate("QPageSetupWidget", "right margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_ACCESSIBILITY
+        rightMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "right margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_ACCESSIBILITY
+#ifndef QT_NO_TOOLTIP
+        bottomMargin->setToolTip(QApplication::translate("QPageSetupWidget", "bottom margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_ACCESSIBILITY
+        bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_ACCESSIBILITY
+        Q_UNUSED(QPageSetupWidget);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QPageSetupWidget: public Ui_QPageSetupWidget {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QPAGESETUPWIDGET_H
diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui b/tests/auto/uic/baseline/qprintpropertieswidget.ui
new file mode 100644
index 0000000..26fa095
--- /dev/null
+++ b/tests/auto/uic/baseline/qprintpropertieswidget.ui
@@ -0,0 +1,70 @@
+<ui version="4.0" >
+ <class>QPrintPropertiesWidget</class>
+ <widget class="QWidget" name="QPrintPropertiesWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>396</width>
+    <height>288</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tabs" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tabPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>392</width>
+        <height>261</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Page</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout" >
+       <item>
+        <widget class="QPageSetupWidget" native="1" name="pageSetup" />
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="cupsPropertiesPage" >
+      <attribute name="title" >
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout_2" >
+       <item>
+        <widget class="QTreeView" name="treeView" >
+         <property name="alternatingRowColors" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QPageSetupWidget</class>
+   <extends>QWidget</extends>
+   <header>qpagesetupdialog_unix_p.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
new file mode 100644
index 0000000..75a3e6d
--- /dev/null
+++ b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
@@ -0,0 +1,99 @@
+/********************************************************************************
+** Form generated from reading ui file 'qprintpropertieswidget.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QPRINTPROPERTIESWIDGET_H
+#define QPRINTPROPERTIESWIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QTabWidget>
+#include <QtGui/QTreeView>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "qpagesetupdialog_unix_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QPrintPropertiesWidget
+{
+public:
+    QVBoxLayout *verticalLayout_4;
+    QTabWidget *tabs;
+    QWidget *tabPage;
+    QHBoxLayout *horizontalLayout;
+    QPageSetupWidget *pageSetup;
+    QWidget *cupsPropertiesPage;
+    QHBoxLayout *horizontalLayout_2;
+    QTreeView *treeView;
+
+    void setupUi(QWidget *QPrintPropertiesWidget)
+    {
+        if (QPrintPropertiesWidget->objectName().isEmpty())
+            QPrintPropertiesWidget->setObjectName(QString::fromUtf8("QPrintPropertiesWidget"));
+        QPrintPropertiesWidget->resize(396, 288);
+        verticalLayout_4 = new QVBoxLayout(QPrintPropertiesWidget);
+        verticalLayout_4->setMargin(0);
+        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
+        tabs = new QTabWidget(QPrintPropertiesWidget);
+        tabs->setObjectName(QString::fromUtf8("tabs"));
+        tabPage = new QWidget();
+        tabPage->setObjectName(QString::fromUtf8("tabPage"));
+        tabPage->setGeometry(QRect(0, 0, 392, 261));
+        horizontalLayout = new QHBoxLayout(tabPage);
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        pageSetup = new QPageSetupWidget(tabPage);
+        pageSetup->setObjectName(QString::fromUtf8("pageSetup"));
+
+        horizontalLayout->addWidget(pageSetup);
+
+        tabs->addTab(tabPage, QString());
+        cupsPropertiesPage = new QWidget();
+        cupsPropertiesPage->setObjectName(QString::fromUtf8("cupsPropertiesPage"));
+        horizontalLayout_2 = new QHBoxLayout(cupsPropertiesPage);
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        treeView = new QTreeView(cupsPropertiesPage);
+        treeView->setObjectName(QString::fromUtf8("treeView"));
+        treeView->setAlternatingRowColors(true);
+
+        horizontalLayout_2->addWidget(treeView);
+
+        tabs->addTab(cupsPropertiesPage, QString());
+
+        verticalLayout_4->addWidget(tabs);
+
+
+        retranslateUi(QPrintPropertiesWidget);
+
+        tabs->setCurrentIndex(0);
+
+
+        QMetaObject::connectSlotsByName(QPrintPropertiesWidget);
+    } // setupUi
+
+    void retranslateUi(QWidget *QPrintPropertiesWidget)
+    {
+        QPrintPropertiesWidget->setWindowTitle(QApplication::translate("QPrintPropertiesWidget", "Form", 0, QApplication::UnicodeUTF8));
+        tabs->setTabText(tabs->indexOf(tabPage), QApplication::translate("QPrintPropertiesWidget", "Page", 0, QApplication::UnicodeUTF8));
+        tabs->setTabText(tabs->indexOf(cupsPropertiesPage), QApplication::translate("QPrintPropertiesWidget", "Advanced", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QPrintPropertiesWidget);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QPrintPropertiesWidget: public Ui_QPrintPropertiesWidget {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QPRINTPROPERTIESWIDGET_H
diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui b/tests/auto/uic/baseline/qprintsettingsoutput.ui
new file mode 100644
index 0000000..de8f4fa
--- /dev/null
+++ b/tests/auto/uic/baseline/qprintsettingsoutput.ui
@@ -0,0 +1,371 @@
+<ui version="4.0" >
+ <class>QPrintSettingsOutput</class>
+ <widget class="QWidget" name="QPrintSettingsOutput" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>416</width>
+    <height>166</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_2" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tabs" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="copiesTab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>412</width>
+        <height>139</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Copies</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout" >
+       <item>
+        <widget class="QGroupBox" name="gbPrintRange" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title" >
+          <string>Print range</string>
+         </property>
+         <layout class="QVBoxLayout" name="_3" >
+          <property name="spacing" >
+           <number>4</number>
+          </property>
+          <property name="margin" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QRadioButton" name="printAll" >
+            <property name="text" >
+             <string>Print all</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="_4" >
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QRadioButton" name="printRange" >
+              <property name="text" >
+               <string>Pages from</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="from" >
+              <property name="enabled" >
+               <bool>false</bool>
+              </property>
+              <property name="minimum" >
+               <number>1</number>
+              </property>
+              <property name="maximum" >
+               <number>999</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_3" >
+              <property name="text" >
+               <string>to</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="to" >
+              <property name="enabled" >
+               <bool>false</bool>
+              </property>
+              <property name="minimum" >
+               <number>1</number>
+              </property>
+              <property name="maximum" >
+               <number>999</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>0</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="printSelection" >
+            <property name="text" >
+             <string>Selection</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>1</width>
+              <height>1</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Output Settings</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>Copies:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>copies</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="2" >
+           <widget class="QSpinBox" name="copies" >
+            <property name="minimum" >
+             <number>1</number>
+            </property>
+            <property name="maximum" >
+             <number>999</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3" >
+           <spacer name="horizontalSpacer" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>91</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="0" colspan="2" >
+           <widget class="QCheckBox" name="collate" >
+            <property name="text" >
+             <string>Collate</string>
+            </property>
+           </widget>
+          </item>
+          <item rowspan="2" row="1" column="2" colspan="2" >
+           <widget class="QLabel" name="outputIcon" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Ignored" hsizetype="Ignored" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2" >
+           <widget class="QCheckBox" name="reverse" >
+            <property name="text" >
+             <string>Reverse</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" colspan="4" >
+           <spacer name="verticalSpacer_2" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>0</width>
+              <height>1</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="optionsTab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>412</width>
+        <height>139</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Options</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="1" >
+        <widget class="QGroupBox" name="colorMode" >
+         <property name="title" >
+          <string>Color Mode</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4" >
+          <item row="2" column="0" >
+           <spacer name="verticalSpacer_6" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>1</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="color" >
+            <property name="text" >
+             <string>Color</string>
+            </property>
+           </widget>
+          </item>
+          <item rowspan="3" row="0" column="1" >
+           <widget class="QLabel" name="colorIcon" />
+          </item>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="grayscale" >
+            <property name="text" >
+             <string>Grayscale</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QGroupBox" name="duplex" >
+         <property name="title" >
+          <string>Duplex Printing</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout" >
+          <item>
+           <widget class="QRadioButton" name="noDuplex" >
+            <property name="text" >
+             <string>None</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="duplexLong" >
+            <property name="text" >
+             <string>Long side</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="duplexShort" >
+            <property name="text" >
+             <string>Short side</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>1</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>printRange</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>from</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>76</x>
+     <y>59</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>122</x>
+     <y>57</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>printRange</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>to</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>69</x>
+     <y>67</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>215</x>
+     <y>67</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
new file mode 100644
index 0000000..e51aadb
--- /dev/null
+++ b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
@@ -0,0 +1,313 @@
+/********************************************************************************
+** Form generated from reading ui file 'qprintsettingsoutput.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QPRINTSETTINGSOUTPUT_H
+#define QPRINTSETTINGSOUTPUT_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTabWidget>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QPrintSettingsOutput
+{
+public:
+    QHBoxLayout *horizontalLayout_2;
+    QTabWidget *tabs;
+    QWidget *copiesTab;
+    QHBoxLayout *horizontalLayout;
+    QGroupBox *gbPrintRange;
+    QVBoxLayout *_3;
+    QRadioButton *printAll;
+    QHBoxLayout *_4;
+    QRadioButton *printRange;
+    QSpinBox *from;
+    QLabel *label_3;
+    QSpinBox *to;
+    QSpacerItem *spacerItem;
+    QRadioButton *printSelection;
+    QSpacerItem *verticalSpacer;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QSpinBox *copies;
+    QSpacerItem *horizontalSpacer;
+    QCheckBox *collate;
+    QLabel *outputIcon;
+    QCheckBox *reverse;
+    QSpacerItem *verticalSpacer_2;
+    QWidget *optionsTab;
+    QGridLayout *gridLayout_2;
+    QGroupBox *colorMode;
+    QGridLayout *gridLayout_4;
+    QSpacerItem *verticalSpacer_6;
+    QRadioButton *color;
+    QLabel *colorIcon;
+    QRadioButton *grayscale;
+    QGroupBox *duplex;
+    QVBoxLayout *verticalLayout;
+    QRadioButton *noDuplex;
+    QRadioButton *duplexLong;
+    QRadioButton *duplexShort;
+    QSpacerItem *verticalSpacer1;
+
+    void setupUi(QWidget *QPrintSettingsOutput)
+    {
+        if (QPrintSettingsOutput->objectName().isEmpty())
+            QPrintSettingsOutput->setObjectName(QString::fromUtf8("QPrintSettingsOutput"));
+        QPrintSettingsOutput->resize(416, 166);
+        horizontalLayout_2 = new QHBoxLayout(QPrintSettingsOutput);
+        horizontalLayout_2->setMargin(0);
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        tabs = new QTabWidget(QPrintSettingsOutput);
+        tabs->setObjectName(QString::fromUtf8("tabs"));
+        copiesTab = new QWidget();
+        copiesTab->setObjectName(QString::fromUtf8("copiesTab"));
+        copiesTab->setGeometry(QRect(0, 0, 412, 139));
+        horizontalLayout = new QHBoxLayout(copiesTab);
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        gbPrintRange = new QGroupBox(copiesTab);
+        gbPrintRange->setObjectName(QString::fromUtf8("gbPrintRange"));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(gbPrintRange->sizePolicy().hasHeightForWidth());
+        gbPrintRange->setSizePolicy(sizePolicy);
+        _3 = new QVBoxLayout(gbPrintRange);
+        _3->setSpacing(4);
+        _3->setMargin(6);
+        _3->setObjectName(QString::fromUtf8("_3"));
+        printAll = new QRadioButton(gbPrintRange);
+        printAll->setObjectName(QString::fromUtf8("printAll"));
+        printAll->setChecked(true);
+
+        _3->addWidget(printAll);
+
+        _4 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        _4->setSpacing(6);
+#endif
+        _4->setMargin(0);
+        _4->setObjectName(QString::fromUtf8("_4"));
+        printRange = new QRadioButton(gbPrintRange);
+        printRange->setObjectName(QString::fromUtf8("printRange"));
+
+        _4->addWidget(printRange);
+
+        from = new QSpinBox(gbPrintRange);
+        from->setObjectName(QString::fromUtf8("from"));
+        from->setEnabled(false);
+        from->setMinimum(1);
+        from->setMaximum(999);
+
+        _4->addWidget(from);
+
+        label_3 = new QLabel(gbPrintRange);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        _4->addWidget(label_3);
+
+        to = new QSpinBox(gbPrintRange);
+        to->setObjectName(QString::fromUtf8("to"));
+        to->setEnabled(false);
+        to->setMinimum(1);
+        to->setMaximum(999);
+
+        _4->addWidget(to);
+
+        spacerItem = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        _4->addItem(spacerItem);
+
+
+        _3->addLayout(_4);
+
+        printSelection = new QRadioButton(gbPrintRange);
+        printSelection->setObjectName(QString::fromUtf8("printSelection"));
+
+        _3->addWidget(printSelection);
+
+        verticalSpacer = new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        _3->addItem(verticalSpacer);
+
+
+        horizontalLayout->addWidget(gbPrintRange);
+
+        groupBox = new QGroupBox(copiesTab);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        gridLayout = new QGridLayout(groupBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        copies = new QSpinBox(groupBox);
+        copies->setObjectName(QString::fromUtf8("copies"));
+        copies->setMinimum(1);
+        copies->setMaximum(999);
+
+        gridLayout->addWidget(copies, 0, 1, 1, 2);
+
+        horizontalSpacer = new QSpacerItem(91, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(horizontalSpacer, 0, 3, 1, 1);
+
+        collate = new QCheckBox(groupBox);
+        collate->setObjectName(QString::fromUtf8("collate"));
+
+        gridLayout->addWidget(collate, 1, 0, 1, 2);
+
+        outputIcon = new QLabel(groupBox);
+        outputIcon->setObjectName(QString::fromUtf8("outputIcon"));
+        QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Ignored);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(outputIcon->sizePolicy().hasHeightForWidth());
+        outputIcon->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(outputIcon, 1, 2, 2, 2);
+
+        reverse = new QCheckBox(groupBox);
+        reverse->setObjectName(QString::fromUtf8("reverse"));
+
+        gridLayout->addWidget(reverse, 2, 0, 1, 2);
+
+        verticalSpacer_2 = new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout->addItem(verticalSpacer_2, 3, 0, 1, 4);
+
+
+        horizontalLayout->addWidget(groupBox);
+
+        tabs->addTab(copiesTab, QString());
+        optionsTab = new QWidget();
+        optionsTab->setObjectName(QString::fromUtf8("optionsTab"));
+        optionsTab->setGeometry(QRect(0, 0, 412, 139));
+        gridLayout_2 = new QGridLayout(optionsTab);
+        gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+        colorMode = new QGroupBox(optionsTab);
+        colorMode->setObjectName(QString::fromUtf8("colorMode"));
+        gridLayout_4 = new QGridLayout(colorMode);
+        gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4"));
+        verticalSpacer_6 = new QSpacerItem(1, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout_4->addItem(verticalSpacer_6, 2, 0, 1, 1);
+
+        color = new QRadioButton(colorMode);
+        color->setObjectName(QString::fromUtf8("color"));
+
+        gridLayout_4->addWidget(color, 0, 0, 1, 1);
+
+        colorIcon = new QLabel(colorMode);
+        colorIcon->setObjectName(QString::fromUtf8("colorIcon"));
+
+        gridLayout_4->addWidget(colorIcon, 0, 1, 3, 1);
+
+        grayscale = new QRadioButton(colorMode);
+        grayscale->setObjectName(QString::fromUtf8("grayscale"));
+
+        gridLayout_4->addWidget(grayscale, 1, 0, 1, 1);
+
+
+        gridLayout_2->addWidget(colorMode, 0, 1, 1, 1);
+
+        duplex = new QGroupBox(optionsTab);
+        duplex->setObjectName(QString::fromUtf8("duplex"));
+        verticalLayout = new QVBoxLayout(duplex);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        noDuplex = new QRadioButton(duplex);
+        noDuplex->setObjectName(QString::fromUtf8("noDuplex"));
+        noDuplex->setChecked(true);
+
+        verticalLayout->addWidget(noDuplex);
+
+        duplexLong = new QRadioButton(duplex);
+        duplexLong->setObjectName(QString::fromUtf8("duplexLong"));
+
+        verticalLayout->addWidget(duplexLong);
+
+        duplexShort = new QRadioButton(duplex);
+        duplexShort->setObjectName(QString::fromUtf8("duplexShort"));
+
+        verticalLayout->addWidget(duplexShort);
+
+        verticalSpacer1 = new QSpacerItem(1, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout->addItem(verticalSpacer1);
+
+
+        gridLayout_2->addWidget(duplex, 0, 0, 1, 1);
+
+        tabs->addTab(optionsTab, QString());
+
+        horizontalLayout_2->addWidget(tabs);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(copies);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(QPrintSettingsOutput);
+        QObject::connect(printRange, SIGNAL(toggled(bool)), from, SLOT(setEnabled(bool)));
+        QObject::connect(printRange, SIGNAL(toggled(bool)), to, SLOT(setEnabled(bool)));
+
+        tabs->setCurrentIndex(0);
+
+
+        QMetaObject::connectSlotsByName(QPrintSettingsOutput);
+    } // setupUi
+
+    void retranslateUi(QWidget *QPrintSettingsOutput)
+    {
+        QPrintSettingsOutput->setWindowTitle(QApplication::translate("QPrintSettingsOutput", "Form", 0, QApplication::UnicodeUTF8));
+        gbPrintRange->setTitle(QApplication::translate("QPrintSettingsOutput", "Print range", 0, QApplication::UnicodeUTF8));
+        printAll->setText(QApplication::translate("QPrintSettingsOutput", "Print all", 0, QApplication::UnicodeUTF8));
+        printRange->setText(QApplication::translate("QPrintSettingsOutput", "Pages from", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("QPrintSettingsOutput", "to", 0, QApplication::UnicodeUTF8));
+        printSelection->setText(QApplication::translate("QPrintSettingsOutput", "Selection", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("QPrintSettingsOutput", "Output Settings", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("QPrintSettingsOutput", "Copies:", 0, QApplication::UnicodeUTF8));
+        collate->setText(QApplication::translate("QPrintSettingsOutput", "Collate", 0, QApplication::UnicodeUTF8));
+        reverse->setText(QApplication::translate("QPrintSettingsOutput", "Reverse", 0, QApplication::UnicodeUTF8));
+        tabs->setTabText(tabs->indexOf(copiesTab), QApplication::translate("QPrintSettingsOutput", "Copies", 0, QApplication::UnicodeUTF8));
+        colorMode->setTitle(QApplication::translate("QPrintSettingsOutput", "Color Mode", 0, QApplication::UnicodeUTF8));
+        color->setText(QApplication::translate("QPrintSettingsOutput", "Color", 0, QApplication::UnicodeUTF8));
+        grayscale->setText(QApplication::translate("QPrintSettingsOutput", "Grayscale", 0, QApplication::UnicodeUTF8));
+        duplex->setTitle(QApplication::translate("QPrintSettingsOutput", "Duplex Printing", 0, QApplication::UnicodeUTF8));
+        noDuplex->setText(QApplication::translate("QPrintSettingsOutput", "None", 0, QApplication::UnicodeUTF8));
+        duplexLong->setText(QApplication::translate("QPrintSettingsOutput", "Long side", 0, QApplication::UnicodeUTF8));
+        duplexShort->setText(QApplication::translate("QPrintSettingsOutput", "Short side", 0, QApplication::UnicodeUTF8));
+        tabs->setTabText(tabs->indexOf(optionsTab), QApplication::translate("QPrintSettingsOutput", "Options", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QPrintSettingsOutput);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QPrintSettingsOutput: public Ui_QPrintSettingsOutput {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QPRINTSETTINGSOUTPUT_H
diff --git a/tests/auto/uic/baseline/qprintwidget.ui b/tests/auto/uic/baseline/qprintwidget.ui
new file mode 100644
index 0000000..8a4f3bd
--- /dev/null
+++ b/tests/auto/uic/baseline/qprintwidget.ui
@@ -0,0 +1,116 @@
+<ui version="4.0" >
+ <class>QPrintWidget</class>
+ <widget class="QWidget" name="QPrintWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>443</width>
+    <height>175</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_2" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="printerGroup" >
+     <property name="title" >
+      <string>Printer</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>&amp;Name:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printers</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="printers" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+          <horstretch>3</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QPushButton" name="properties" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>P&amp;roperties</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Location:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLabel" name="location" />
+      </item>
+      <item row="1" column="2" >
+       <widget class="QCheckBox" name="preview" >
+        <property name="text" >
+         <string>Preview</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Type:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLabel" name="type" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="lOutput" >
+        <property name="text" >
+         <string>Output &amp;file:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>filename</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QLineEdit" name="filename" />
+        </item>
+        <item>
+         <widget class="QToolButton" name="fileBrowser" >
+          <property name="text" >
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qprintwidget.ui.h b/tests/auto/uic/baseline/qprintwidget.ui.h
new file mode 100644
index 0000000..f6c0989
--- /dev/null
+++ b/tests/auto/uic/baseline/qprintwidget.ui.h
@@ -0,0 +1,167 @@
+/********************************************************************************
+** Form generated from reading ui file 'qprintwidget.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QPRINTWIDGET_H
+#define QPRINTWIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QToolButton>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QPrintWidget
+{
+public:
+    QHBoxLayout *horizontalLayout_2;
+    QGroupBox *printerGroup;
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QComboBox *printers;
+    QPushButton *properties;
+    QLabel *label_2;
+    QLabel *location;
+    QCheckBox *preview;
+    QLabel *label_3;
+    QLabel *type;
+    QLabel *lOutput;
+    QHBoxLayout *horizontalLayout;
+    QLineEdit *filename;
+    QToolButton *fileBrowser;
+
+    void setupUi(QWidget *QPrintWidget)
+    {
+        if (QPrintWidget->objectName().isEmpty())
+            QPrintWidget->setObjectName(QString::fromUtf8("QPrintWidget"));
+        QPrintWidget->resize(443, 175);
+        horizontalLayout_2 = new QHBoxLayout(QPrintWidget);
+        horizontalLayout_2->setMargin(0);
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        printerGroup = new QGroupBox(QPrintWidget);
+        printerGroup->setObjectName(QString::fromUtf8("printerGroup"));
+        gridLayout = new QGridLayout(printerGroup);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(printerGroup);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        printers = new QComboBox(printerGroup);
+        printers->setObjectName(QString::fromUtf8("printers"));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(3);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(printers->sizePolicy().hasHeightForWidth());
+        printers->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(printers, 0, 1, 1, 1);
+
+        properties = new QPushButton(printerGroup);
+        properties->setObjectName(QString::fromUtf8("properties"));
+        QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        sizePolicy1.setHorizontalStretch(1);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(properties->sizePolicy().hasHeightForWidth());
+        properties->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(properties, 0, 2, 1, 1);
+
+        label_2 = new QLabel(printerGroup);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout->addWidget(label_2, 1, 0, 1, 1);
+
+        location = new QLabel(printerGroup);
+        location->setObjectName(QString::fromUtf8("location"));
+
+        gridLayout->addWidget(location, 1, 1, 1, 1);
+
+        preview = new QCheckBox(printerGroup);
+        preview->setObjectName(QString::fromUtf8("preview"));
+
+        gridLayout->addWidget(preview, 1, 2, 1, 1);
+
+        label_3 = new QLabel(printerGroup);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout->addWidget(label_3, 2, 0, 1, 1);
+
+        type = new QLabel(printerGroup);
+        type->setObjectName(QString::fromUtf8("type"));
+
+        gridLayout->addWidget(type, 2, 1, 1, 1);
+
+        lOutput = new QLabel(printerGroup);
+        lOutput->setObjectName(QString::fromUtf8("lOutput"));
+
+        gridLayout->addWidget(lOutput, 3, 0, 1, 1);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        filename = new QLineEdit(printerGroup);
+        filename->setObjectName(QString::fromUtf8("filename"));
+
+        horizontalLayout->addWidget(filename);
+
+        fileBrowser = new QToolButton(printerGroup);
+        fileBrowser->setObjectName(QString::fromUtf8("fileBrowser"));
+
+        horizontalLayout->addWidget(fileBrowser);
+
+
+        gridLayout->addLayout(horizontalLayout, 3, 1, 1, 2);
+
+
+        horizontalLayout_2->addWidget(printerGroup);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(printers);
+        lOutput->setBuddy(filename);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(QPrintWidget);
+
+        QMetaObject::connectSlotsByName(QPrintWidget);
+    } // setupUi
+
+    void retranslateUi(QWidget *QPrintWidget)
+    {
+        QPrintWidget->setWindowTitle(QApplication::translate("QPrintWidget", "Form", 0, QApplication::UnicodeUTF8));
+        printerGroup->setTitle(QApplication::translate("QPrintWidget", "Printer", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("QPrintWidget", "&Name:", 0, QApplication::UnicodeUTF8));
+        properties->setText(QApplication::translate("QPrintWidget", "P&roperties", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("QPrintWidget", "Location:", 0, QApplication::UnicodeUTF8));
+        preview->setText(QApplication::translate("QPrintWidget", "Preview", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("QPrintWidget", "Type:", 0, QApplication::UnicodeUTF8));
+        lOutput->setText(QApplication::translate("QPrintWidget", "Output &file:", 0, QApplication::UnicodeUTF8));
+        fileBrowser->setText(QApplication::translate("QPrintWidget", "...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QPrintWidget);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QPrintWidget: public Ui_QPrintWidget {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QPRINTWIDGET_H
diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui b/tests/auto/uic/baseline/qsqlconnectiondialog.ui
new file mode 100644
index 0000000..91a8700
--- /dev/null
+++ b/tests/auto/uic/baseline/qsqlconnectiondialog.ui
@@ -0,0 +1,224 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>QSqlConnectionDialogUi</class>
+ <widget class="QDialog" name="QSqlConnectionDialogUi" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>315</width>
+    <height>302</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Connect...</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="connGroupBox" >
+     <property name="title" >
+      <string>Connection settings</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="comboDriver" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="textLabel4" >
+        <property name="text" >
+         <string>&amp;Username:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editUsername</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="textLabel2" >
+        <property name="text" >
+         <string>D&amp;river</string>
+        </property>
+        <property name="buddy" >
+         <cstring>comboDriver</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="editDatabase" />
+      </item>
+      <item row="5" column="1" >
+       <widget class="QSpinBox" name="portSpinBox" >
+        <property name="specialValueText" >
+         <string>Default</string>
+        </property>
+        <property name="maximum" >
+         <number>65535</number>
+        </property>
+        <property name="minimum" >
+         <number>-1</number>
+        </property>
+        <property name="value" >
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="textLabel3" >
+        <property name="text" >
+         <string>Database Name:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editDatabase</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="editPassword" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="editUsername" />
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="editHostname" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="textLabel5" >
+        <property name="text" >
+         <string>&amp;Hostname:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editHostname</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="textLabel5_2" >
+        <property name="text" >
+         <string>P&amp;ort:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>portSpinBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="textLabel4_2" >
+        <property name="text" >
+         <string>&amp;Password:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editPassword</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="dbCheckBox" >
+       <property name="text" >
+        <string>Us&amp;e predefined in-memory database</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>comboDriver</tabstop>
+  <tabstop>editDatabase</tabstop>
+  <tabstop>editUsername</tabstop>
+  <tabstop>editPassword</tabstop>
+  <tabstop>editHostname</tabstop>
+  <tabstop>portSpinBox</tabstop>
+  <tabstop>dbCheckBox</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
new file mode 100644
index 0000000..f36d0ac
--- /dev/null
+++ b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
@@ -0,0 +1,234 @@
+/********************************************************************************
+** Form generated from reading ui file 'qsqlconnectiondialog.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QSQLCONNECTIONDIALOG_H
+#define QSQLCONNECTIONDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QSqlConnectionDialogUi
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *connGroupBox;
+    QGridLayout *gridLayout;
+    QComboBox *comboDriver;
+    QLabel *textLabel4;
+    QLabel *textLabel2;
+    QLineEdit *editDatabase;
+    QSpinBox *portSpinBox;
+    QLabel *textLabel3;
+    QLineEdit *editPassword;
+    QLineEdit *editUsername;
+    QLineEdit *editHostname;
+    QLabel *textLabel5;
+    QLabel *textLabel5_2;
+    QLabel *textLabel4_2;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacerItem;
+    QCheckBox *dbCheckBox;
+    QHBoxLayout *hboxLayout1;
+    QSpacerItem *spacerItem1;
+    QPushButton *okButton;
+    QPushButton *cancelButton;
+
+    void setupUi(QDialog *QSqlConnectionDialogUi)
+    {
+        if (QSqlConnectionDialogUi->objectName().isEmpty())
+            QSqlConnectionDialogUi->setObjectName(QString::fromUtf8("QSqlConnectionDialogUi"));
+        QSqlConnectionDialogUi->resize(315, 302);
+        vboxLayout = new QVBoxLayout(QSqlConnectionDialogUi);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(8);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        connGroupBox = new QGroupBox(QSqlConnectionDialogUi);
+        connGroupBox->setObjectName(QString::fromUtf8("connGroupBox"));
+        gridLayout = new QGridLayout(connGroupBox);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+        gridLayout->setMargin(8);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        comboDriver = new QComboBox(connGroupBox);
+        comboDriver->setObjectName(QString::fromUtf8("comboDriver"));
+
+        gridLayout->addWidget(comboDriver, 0, 1, 1, 1);
+
+        textLabel4 = new QLabel(connGroupBox);
+        textLabel4->setObjectName(QString::fromUtf8("textLabel4"));
+
+        gridLayout->addWidget(textLabel4, 2, 0, 1, 1);
+
+        textLabel2 = new QLabel(connGroupBox);
+        textLabel2->setObjectName(QString::fromUtf8("textLabel2"));
+
+        gridLayout->addWidget(textLabel2, 0, 0, 1, 1);
+
+        editDatabase = new QLineEdit(connGroupBox);
+        editDatabase->setObjectName(QString::fromUtf8("editDatabase"));
+
+        gridLayout->addWidget(editDatabase, 1, 1, 1, 1);
+
+        portSpinBox = new QSpinBox(connGroupBox);
+        portSpinBox->setObjectName(QString::fromUtf8("portSpinBox"));
+        portSpinBox->setMaximum(65535);
+        portSpinBox->setMinimum(-1);
+        portSpinBox->setValue(-1);
+
+        gridLayout->addWidget(portSpinBox, 5, 1, 1, 1);
+
+        textLabel3 = new QLabel(connGroupBox);
+        textLabel3->setObjectName(QString::fromUtf8("textLabel3"));
+
+        gridLayout->addWidget(textLabel3, 1, 0, 1, 1);
+
+        editPassword = new QLineEdit(connGroupBox);
+        editPassword->setObjectName(QString::fromUtf8("editPassword"));
+        editPassword->setEchoMode(QLineEdit::Password);
+
+        gridLayout->addWidget(editPassword, 3, 1, 1, 1);
+
+        editUsername = new QLineEdit(connGroupBox);
+        editUsername->setObjectName(QString::fromUtf8("editUsername"));
+
+        gridLayout->addWidget(editUsername, 2, 1, 1, 1);
+
+        editHostname = new QLineEdit(connGroupBox);
+        editHostname->setObjectName(QString::fromUtf8("editHostname"));
+
+        gridLayout->addWidget(editHostname, 4, 1, 1, 1);
+
+        textLabel5 = new QLabel(connGroupBox);
+        textLabel5->setObjectName(QString::fromUtf8("textLabel5"));
+
+        gridLayout->addWidget(textLabel5, 4, 0, 1, 1);
+
+        textLabel5_2 = new QLabel(connGroupBox);
+        textLabel5_2->setObjectName(QString::fromUtf8("textLabel5_2"));
+
+        gridLayout->addWidget(textLabel5_2, 5, 0, 1, 1);
+
+        textLabel4_2 = new QLabel(connGroupBox);
+        textLabel4_2->setObjectName(QString::fromUtf8("textLabel4_2"));
+
+        gridLayout->addWidget(textLabel4_2, 3, 0, 1, 1);
+
+
+        vboxLayout->addWidget(connGroupBox);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+        dbCheckBox = new QCheckBox(QSqlConnectionDialogUi);
+        dbCheckBox->setObjectName(QString::fromUtf8("dbCheckBox"));
+
+        hboxLayout->addWidget(dbCheckBox);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem1);
+
+        okButton = new QPushButton(QSqlConnectionDialogUi);
+        okButton->setObjectName(QString::fromUtf8("okButton"));
+        okButton->setDefault(true);
+
+        hboxLayout1->addWidget(okButton);
+
+        cancelButton = new QPushButton(QSqlConnectionDialogUi);
+        cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
+
+        hboxLayout1->addWidget(cancelButton);
+
+
+        vboxLayout->addLayout(hboxLayout1);
+
+#ifndef QT_NO_SHORTCUT
+        textLabel4->setBuddy(editUsername);
+        textLabel2->setBuddy(comboDriver);
+        textLabel3->setBuddy(editDatabase);
+        textLabel5->setBuddy(editHostname);
+        textLabel5_2->setBuddy(portSpinBox);
+        textLabel4_2->setBuddy(editPassword);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(comboDriver, editDatabase);
+        QWidget::setTabOrder(editDatabase, editUsername);
+        QWidget::setTabOrder(editUsername, editPassword);
+        QWidget::setTabOrder(editPassword, editHostname);
+        QWidget::setTabOrder(editHostname, portSpinBox);
+        QWidget::setTabOrder(portSpinBox, dbCheckBox);
+        QWidget::setTabOrder(dbCheckBox, okButton);
+        QWidget::setTabOrder(okButton, cancelButton);
+
+        retranslateUi(QSqlConnectionDialogUi);
+
+        QMetaObject::connectSlotsByName(QSqlConnectionDialogUi);
+    } // setupUi
+
+    void retranslateUi(QDialog *QSqlConnectionDialogUi)
+    {
+        QSqlConnectionDialogUi->setWindowTitle(QApplication::translate("QSqlConnectionDialogUi", "Connect...", 0, QApplication::UnicodeUTF8));
+        connGroupBox->setTitle(QApplication::translate("QSqlConnectionDialogUi", "Connection settings", 0, QApplication::UnicodeUTF8));
+        textLabel4->setText(QApplication::translate("QSqlConnectionDialogUi", "&Username:", 0, QApplication::UnicodeUTF8));
+        textLabel2->setText(QApplication::translate("QSqlConnectionDialogUi", "D&river", 0, QApplication::UnicodeUTF8));
+        portSpinBox->setSpecialValueText(QApplication::translate("QSqlConnectionDialogUi", "Default", 0, QApplication::UnicodeUTF8));
+        textLabel3->setText(QApplication::translate("QSqlConnectionDialogUi", "Database Name:", 0, QApplication::UnicodeUTF8));
+        textLabel5->setText(QApplication::translate("QSqlConnectionDialogUi", "&Hostname:", 0, QApplication::UnicodeUTF8));
+        textLabel5_2->setText(QApplication::translate("QSqlConnectionDialogUi", "P&ort:", 0, QApplication::UnicodeUTF8));
+        textLabel4_2->setText(QApplication::translate("QSqlConnectionDialogUi", "&Password:", 0, QApplication::UnicodeUTF8));
+        dbCheckBox->setText(QApplication::translate("QSqlConnectionDialogUi", "Us&e predefined in-memory database", 0, QApplication::UnicodeUTF8));
+        okButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&OK", 0, QApplication::UnicodeUTF8));
+        cancelButton->setText(QApplication::translate("QSqlConnectionDialogUi", "&Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QSqlConnectionDialogUi);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QSqlConnectionDialogUi: public Ui_QSqlConnectionDialogUi {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QSQLCONNECTIONDIALOG_H
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui b/tests/auto/uic/baseline/qtgradientdialog.ui
new file mode 100644
index 0000000..ffd1ead
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui
@@ -0,0 +1,120 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>QtGradientDialog</class>
+ <widget class="QDialog" name="QtGradientDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>178</width>
+    <height>81</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Edit Gradient</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QtGradientEditor" name="gradientEditor" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QtGradientEditor</class>
+   <extends>QFrame</extends>
+   <header>qtgradienteditor.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>QtGradientDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>72</x>
+     <y>224</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>21</x>
+     <y>243</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>QtGradientDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>168</x>
+     <y>233</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>152</x>
+     <y>251</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui.h b/tests/auto/uic/baseline/qtgradientdialog.ui.h
new file mode 100644
index 0000000..8a5d18c
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui.h
@@ -0,0 +1,120 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'qtgradientdialog.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QTGRADIENTDIALOG_H
+#define QTGRADIENTDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QVBoxLayout>
+#include "qtgradienteditor.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QtGradientDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QtGradientEditor *gradientEditor;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *QtGradientDialog)
+    {
+        if (QtGradientDialog->objectName().isEmpty())
+            QtGradientDialog->setObjectName(QString::fromUtf8("QtGradientDialog"));
+        QtGradientDialog->resize(178, 81);
+        vboxLayout = new QVBoxLayout(QtGradientDialog);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        gradientEditor = new QtGradientEditor(QtGradientDialog);
+        gradientEditor->setObjectName(QString::fromUtf8("gradientEditor"));
+        QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(gradientEditor->sizePolicy().hasHeightForWidth());
+        gradientEditor->setSizePolicy(sizePolicy);
+
+        vboxLayout->addWidget(gradientEditor);
+
+        buttonBox = new QDialogButtonBox(QtGradientDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(QtGradientDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), QtGradientDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), QtGradientDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(QtGradientDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *QtGradientDialog)
+    {
+        QtGradientDialog->setWindowTitle(QApplication::translate("QtGradientDialog", "Edit Gradient", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QtGradientDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QtGradientDialog: public Ui_QtGradientDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QTGRADIENTDIALOG_H
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui b/tests/auto/uic/baseline/qtgradienteditor.ui
new file mode 100644
index 0000000..aa6b288
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui
@@ -0,0 +1,1376 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>QtGradientEditor</class>
+ <widget class="QWidget" name="QtGradientEditor" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>364</width>
+    <height>518</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <widget class="QFrame" name="frame" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>69</y>
+     <width>193</width>
+     <height>150</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QtGradientWidget" native="1" name="gradientWidget" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Gradient Editor</string>
+      </property>
+      <property name="whatsThis" >
+       <string>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag &amp; drop.</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="label1" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>69</y>
+     <width>64</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>1</string>
+   </property>
+  </widget>
+  <widget class="QDoubleSpinBox" name="spinBox1" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>69</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="keyboardTracking" >
+    <bool>false</bool>
+   </property>
+   <property name="decimals" >
+    <number>3</number>
+   </property>
+   <property name="maximum" >
+    <double>1.000000000000000</double>
+   </property>
+   <property name="singleStep" >
+    <double>0.010000000000000</double>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label2" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>99</y>
+     <width>64</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>2</string>
+   </property>
+  </widget>
+  <widget class="QDoubleSpinBox" name="spinBox2" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>99</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="keyboardTracking" >
+    <bool>false</bool>
+   </property>
+   <property name="decimals" >
+    <number>3</number>
+   </property>
+   <property name="maximum" >
+    <double>1.000000000000000</double>
+   </property>
+   <property name="singleStep" >
+    <double>0.010000000000000</double>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label3" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>129</y>
+     <width>64</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>3</string>
+   </property>
+  </widget>
+  <widget class="QDoubleSpinBox" name="spinBox3" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>129</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="keyboardTracking" >
+    <bool>false</bool>
+   </property>
+   <property name="decimals" >
+    <number>3</number>
+   </property>
+   <property name="maximum" >
+    <double>1.000000000000000</double>
+   </property>
+   <property name="singleStep" >
+    <double>0.010000000000000</double>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label4" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>159</y>
+     <width>64</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>4</string>
+   </property>
+  </widget>
+  <widget class="QDoubleSpinBox" name="spinBox4" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>159</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="keyboardTracking" >
+    <bool>false</bool>
+   </property>
+   <property name="decimals" >
+    <number>3</number>
+   </property>
+   <property name="maximum" >
+    <double>1.000000000000000</double>
+   </property>
+   <property name="singleStep" >
+    <double>0.010000000000000</double>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label5" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>189</y>
+     <width>64</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>5</string>
+   </property>
+  </widget>
+  <widget class="QDoubleSpinBox" name="spinBox5" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>189</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="keyboardTracking" >
+    <bool>false</bool>
+   </property>
+   <property name="decimals" >
+    <number>3</number>
+   </property>
+   <property name="maximum" >
+    <double>1.000000000000000</double>
+   </property>
+   <property name="singleStep" >
+    <double>0.010000000000000</double>
+   </property>
+  </widget>
+  <widget class="QtGradientStopsWidget" native="1" name="gradientStopsWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>225</y>
+     <width>193</width>
+     <height>67</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Gradient Stops Editor</string>
+   </property>
+   <property name="whatsThis" >
+    <string>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag &amp; drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="zoomLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>231</y>
+     <width>64</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Zoom</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="zoomAllButton" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>260</y>
+     <width>72</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Reset Zoom</string>
+   </property>
+   <property name="text" >
+    <string>Reset Zoom</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="positionLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>304</y>
+     <width>64</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Position</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="hLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>335</y>
+     <width>32</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Hue</string>
+   </property>
+   <property name="text" >
+    <string>H</string>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_2" >
+   <property name="geometry" >
+    <rect>
+     <x>48</x>
+     <y>333</y>
+     <width>155</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <layout class="QHBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QtColorLine" native="1" name="hueColorLine" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Hue</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="hueLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>335</y>
+     <width>64</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text" >
+    <string>Hue</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="sLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>364</y>
+     <width>32</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Saturation</string>
+   </property>
+   <property name="text" >
+    <string>S</string>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_5" >
+   <property name="geometry" >
+    <rect>
+     <x>48</x>
+     <y>362</y>
+     <width>155</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <layout class="QHBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QtColorLine" native="1" name="saturationColorLine" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Saturation</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="saturationLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>364</y>
+     <width>64</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text" >
+    <string>Sat</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="vLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>393</y>
+     <width>32</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Value</string>
+   </property>
+   <property name="text" >
+    <string>V</string>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_3" >
+   <property name="geometry" >
+    <rect>
+     <x>48</x>
+     <y>391</y>
+     <width>155</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <layout class="QHBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QtColorLine" native="1" name="valueColorLine" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Value</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="valueLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>393</y>
+     <width>64</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text" >
+    <string>Val</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="aLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>422</y>
+     <width>32</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Alpha</string>
+   </property>
+   <property name="text" >
+    <string>A</string>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_4" >
+   <property name="geometry" >
+    <rect>
+     <x>48</x>
+     <y>420</y>
+     <width>155</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <layout class="QHBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QtColorLine" native="1" name="alphaColorLine" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Alpha</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="alphaLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>422</y>
+     <width>64</width>
+     <height>18</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text" >
+    <string>Alpha</string>
+   </property>
+  </widget>
+  <widget class="QComboBox" name="typeComboBox" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>40</y>
+     <width>79</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Type</string>
+   </property>
+  </widget>
+  <widget class="QComboBox" name="spreadComboBox" >
+   <property name="geometry" >
+    <rect>
+     <x>96</x>
+     <y>40</y>
+     <width>72</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Spread</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="colorLabel" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>298</y>
+     <width>32</width>
+     <height>29</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text" >
+    <string>Color</string>
+   </property>
+  </widget>
+  <widget class="QtColorButton" name="colorButton" >
+   <property name="geometry" >
+    <rect>
+     <x>48</x>
+     <y>300</y>
+     <width>26</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Current stop's color</string>
+   </property>
+   <property name="text" >
+    <string/>
+   </property>
+  </widget>
+  <widget class="QRadioButton" name="hsvRadioButton" >
+   <property name="geometry" >
+    <rect>
+     <x>80</x>
+     <y>301</y>
+     <width>49</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Show HSV specification</string>
+   </property>
+   <property name="text" >
+    <string>HSV</string>
+   </property>
+   <property name="checked" >
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QRadioButton" name="rgbRadioButton" >
+   <property name="geometry" >
+    <rect>
+     <x>135</x>
+     <y>301</y>
+     <width>49</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Show RGB specification</string>
+   </property>
+   <property name="text" >
+    <string>RGB</string>
+   </property>
+  </widget>
+  <widget class="QWidget" native="1" name="positionWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>304</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QDoubleSpinBox" name="positionSpinBox" >
+      <property name="toolTip" >
+       <string>Current stop's position</string>
+      </property>
+      <property name="keyboardTracking" >
+       <bool>false</bool>
+      </property>
+      <property name="decimals" >
+       <number>3</number>
+      </property>
+      <property name="minimum" >
+       <double>0.000000000000000</double>
+      </property>
+      <property name="maximum" >
+       <double>1.000000000000000</double>
+      </property>
+      <property name="singleStep" >
+       <double>0.010000000000000</double>
+      </property>
+      <property name="value" >
+       <double>0.000000000000000</double>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="hueWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>333</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QSpinBox" name="hueSpinBox" >
+      <property name="keyboardTracking" >
+       <bool>false</bool>
+      </property>
+      <property name="maximum" >
+       <number>359</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="saturationWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>362</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QSpinBox" name="saturationSpinBox" >
+      <property name="keyboardTracking" >
+       <bool>false</bool>
+      </property>
+      <property name="maximum" >
+       <number>255</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="valueWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>391</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QSpinBox" name="valueSpinBox" >
+      <property name="keyboardTracking" >
+       <bool>false</bool>
+      </property>
+      <property name="maximum" >
+       <number>255</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="alphaWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>420</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QSpinBox" name="alphaSpinBox" >
+      <property name="keyboardTracking" >
+       <bool>false</bool>
+      </property>
+      <property name="maximum" >
+       <number>255</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="zoomWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>279</x>
+     <y>231</y>
+     <width>73</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QSpinBox" name="zoomSpinBox" >
+      <property name="keyboardTracking" >
+       <bool>false</bool>
+      </property>
+      <property name="suffix" >
+       <string>%</string>
+      </property>
+      <property name="minimum" >
+       <number>100</number>
+      </property>
+      <property name="maximum" >
+       <number>10000</number>
+      </property>
+      <property name="singleStep" >
+       <number>100</number>
+      </property>
+      <property name="value" >
+       <number>100</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="line1Widget" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>219</y>
+     <width>143</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="Line" name="line1" >
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="line2Widget" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>292</y>
+     <width>143</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="Line" name="line2" >
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="zoomButtonsWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>209</x>
+     <y>260</y>
+     <width>64</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <layout class="QHBoxLayout" >
+    <property name="leftMargin" >
+     <number>0</number>
+    </property>
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QToolButton" name="zoomInButton" >
+      <property name="toolTip" >
+       <string>Zoom In</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QToolButton" name="zoomOutButton" >
+      <property name="toolTip" >
+       <string>Zoom Out</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>0</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QToolButton" name="detailsButton" >
+   <property name="geometry" >
+    <rect>
+     <x>176</x>
+     <y>40</y>
+     <width>25</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Ignored" hsizetype="Fixed" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="toolTip" >
+    <string>Toggle details extension</string>
+   </property>
+   <property name="text" >
+    <string>></string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="autoRaise" >
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="linearButton" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>30</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Linear Type</string>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="autoRaise" >
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="radialButton" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>10</y>
+     <width>30</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Radial Type</string>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="autoRaise" >
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="conicalButton" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>10</y>
+     <width>30</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Conical Type</string>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="autoRaise" >
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="padButton" >
+   <property name="geometry" >
+    <rect>
+     <x>110</x>
+     <y>10</y>
+     <width>30</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Pad Spread</string>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="autoRaise" >
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="repeatButton" >
+   <property name="geometry" >
+    <rect>
+     <x>140</x>
+     <y>10</y>
+     <width>30</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Repeat Spread</string>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="autoRaise" >
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="reflectButton" >
+   <property name="geometry" >
+    <rect>
+     <x>170</x>
+     <y>10</y>
+     <width>30</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Reflect Spread</string>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="autoRaise" >
+    <bool>true</bool>
+   </property>
+  </widget>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QtColorButton</class>
+   <extends>QToolButton</extends>
+   <header>qtcolorbutton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QtColorLine</class>
+   <extends>QWidget</extends>
+   <header>qtcolorline.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>QtGradientStopsWidget</class>
+   <extends>QWidget</extends>
+   <header>qtgradientstopswidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>QtGradientWidget</class>
+   <extends>QWidget</extends>
+   <header>qtgradientwidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>typeComboBox</tabstop>
+  <tabstop>spreadComboBox</tabstop>
+  <tabstop>detailsButton</tabstop>
+  <tabstop>spinBox1</tabstop>
+  <tabstop>spinBox2</tabstop>
+  <tabstop>spinBox3</tabstop>
+  <tabstop>spinBox4</tabstop>
+  <tabstop>spinBox5</tabstop>
+  <tabstop>zoomSpinBox</tabstop>
+  <tabstop>zoomInButton</tabstop>
+  <tabstop>zoomOutButton</tabstop>
+  <tabstop>zoomAllButton</tabstop>
+  <tabstop>colorButton</tabstop>
+  <tabstop>hsvRadioButton</tabstop>
+  <tabstop>rgbRadioButton</tabstop>
+  <tabstop>positionSpinBox</tabstop>
+  <tabstop>hueSpinBox</tabstop>
+  <tabstop>saturationSpinBox</tabstop>
+  <tabstop>valueSpinBox</tabstop>
+  <tabstop>alphaSpinBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui.h b/tests/auto/uic/baseline/qtgradienteditor.ui.h
new file mode 100644
index 0000000..5eab3a8
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui.h
@@ -0,0 +1,726 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'qtgradienteditor.ui'
+**
+** Created: Mon Jun 16 17:50:21 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QTGRADIENTEDITOR_H
+#define QTGRADIENTEDITOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDoubleSpinBox>
+#include <QtGui/QFrame>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "qtcolorbutton.h"
+#include "qtcolorline.h"
+#include "qtgradientstopswidget.h"
+#include "qtgradientwidget.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QtGradientEditor
+{
+public:
+    QFrame *frame;
+    QVBoxLayout *vboxLayout;
+    QtGradientWidget *gradientWidget;
+    QLabel *label1;
+    QDoubleSpinBox *spinBox1;
+    QLabel *label2;
+    QDoubleSpinBox *spinBox2;
+    QLabel *label3;
+    QDoubleSpinBox *spinBox3;
+    QLabel *label4;
+    QDoubleSpinBox *spinBox4;
+    QLabel *label5;
+    QDoubleSpinBox *spinBox5;
+    QtGradientStopsWidget *gradientStopsWidget;
+    QLabel *zoomLabel;
+    QToolButton *zoomAllButton;
+    QLabel *positionLabel;
+    QLabel *hLabel;
+    QFrame *frame_2;
+    QHBoxLayout *hboxLayout;
+    QtColorLine *hueColorLine;
+    QLabel *hueLabel;
+    QLabel *sLabel;
+    QFrame *frame_5;
+    QHBoxLayout *hboxLayout1;
+    QtColorLine *saturationColorLine;
+    QLabel *saturationLabel;
+    QLabel *vLabel;
+    QFrame *frame_3;
+    QHBoxLayout *hboxLayout2;
+    QtColorLine *valueColorLine;
+    QLabel *valueLabel;
+    QLabel *aLabel;
+    QFrame *frame_4;
+    QHBoxLayout *hboxLayout3;
+    QtColorLine *alphaColorLine;
+    QLabel *alphaLabel;
+    QComboBox *typeComboBox;
+    QComboBox *spreadComboBox;
+    QLabel *colorLabel;
+    QtColorButton *colorButton;
+    QRadioButton *hsvRadioButton;
+    QRadioButton *rgbRadioButton;
+    QWidget *positionWidget;
+    QVBoxLayout *vboxLayout1;
+    QDoubleSpinBox *positionSpinBox;
+    QWidget *hueWidget;
+    QVBoxLayout *vboxLayout2;
+    QSpinBox *hueSpinBox;
+    QWidget *saturationWidget;
+    QVBoxLayout *vboxLayout3;
+    QSpinBox *saturationSpinBox;
+    QWidget *valueWidget;
+    QVBoxLayout *vboxLayout4;
+    QSpinBox *valueSpinBox;
+    QWidget *alphaWidget;
+    QVBoxLayout *vboxLayout5;
+    QSpinBox *alphaSpinBox;
+    QWidget *zoomWidget;
+    QVBoxLayout *vboxLayout6;
+    QSpinBox *zoomSpinBox;
+    QWidget *line1Widget;
+    QVBoxLayout *vboxLayout7;
+    QFrame *line1;
+    QWidget *line2Widget;
+    QVBoxLayout *vboxLayout8;
+    QFrame *line2;
+    QWidget *zoomButtonsWidget;
+    QHBoxLayout *hboxLayout4;
+    QToolButton *zoomInButton;
+    QToolButton *zoomOutButton;
+    QSpacerItem *spacerItem;
+    QToolButton *detailsButton;
+    QToolButton *linearButton;
+    QToolButton *radialButton;
+    QToolButton *conicalButton;
+    QToolButton *padButton;
+    QToolButton *repeatButton;
+    QToolButton *reflectButton;
+
+    void setupUi(QWidget *QtGradientEditor)
+    {
+        if (QtGradientEditor->objectName().isEmpty())
+            QtGradientEditor->setObjectName(QString::fromUtf8("QtGradientEditor"));
+        QtGradientEditor->resize(364, 518);
+        frame = new QFrame(QtGradientEditor);
+        frame->setObjectName(QString::fromUtf8("frame"));
+        frame->setGeometry(QRect(10, 69, 193, 150));
+        QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(frame->sizePolicy().hasHeightForWidth());
+        frame->setSizePolicy(sizePolicy);
+        frame->setFrameShape(QFrame::StyledPanel);
+        frame->setFrameShadow(QFrame::Raised);
+        vboxLayout = new QVBoxLayout(frame);
+        vboxLayout->setSpacing(6);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
+        gradientWidget = new QtGradientWidget(frame);
+        gradientWidget->setObjectName(QString::fromUtf8("gradientWidget"));
+        sizePolicy.setHeightForWidth(gradientWidget->sizePolicy().hasHeightForWidth());
+        gradientWidget->setSizePolicy(sizePolicy);
+
+        vboxLayout->addWidget(gradientWidget);
+
+        label1 = new QLabel(QtGradientEditor);
+        label1->setObjectName(QString::fromUtf8("label1"));
+        label1->setGeometry(QRect(209, 69, 64, 23));
+        spinBox1 = new QDoubleSpinBox(QtGradientEditor);
+        spinBox1->setObjectName(QString::fromUtf8("spinBox1"));
+        spinBox1->setGeometry(QRect(279, 69, 73, 23));
+        spinBox1->setKeyboardTracking(false);
+        spinBox1->setDecimals(3);
+        spinBox1->setMaximum(1);
+        spinBox1->setSingleStep(0.01);
+        label2 = new QLabel(QtGradientEditor);
+        label2->setObjectName(QString::fromUtf8("label2"));
+        label2->setGeometry(QRect(209, 99, 64, 23));
+        spinBox2 = new QDoubleSpinBox(QtGradientEditor);
+        spinBox2->setObjectName(QString::fromUtf8("spinBox2"));
+        spinBox2->setGeometry(QRect(279, 99, 73, 23));
+        spinBox2->setKeyboardTracking(false);
+        spinBox2->setDecimals(3);
+        spinBox2->setMaximum(1);
+        spinBox2->setSingleStep(0.01);
+        label3 = new QLabel(QtGradientEditor);
+        label3->setObjectName(QString::fromUtf8("label3"));
+        label3->setGeometry(QRect(209, 129, 64, 23));
+        spinBox3 = new QDoubleSpinBox(QtGradientEditor);
+        spinBox3->setObjectName(QString::fromUtf8("spinBox3"));
+        spinBox3->setGeometry(QRect(279, 129, 73, 23));
+        spinBox3->setKeyboardTracking(false);
+        spinBox3->setDecimals(3);
+        spinBox3->setMaximum(1);
+        spinBox3->setSingleStep(0.01);
+        label4 = new QLabel(QtGradientEditor);
+        label4->setObjectName(QString::fromUtf8("label4"));
+        label4->setGeometry(QRect(209, 159, 64, 23));
+        spinBox4 = new QDoubleSpinBox(QtGradientEditor);
+        spinBox4->setObjectName(QString::fromUtf8("spinBox4"));
+        spinBox4->setGeometry(QRect(279, 159, 73, 23));
+        spinBox4->setKeyboardTracking(false);
+        spinBox4->setDecimals(3);
+        spinBox4->setMaximum(1);
+        spinBox4->setSingleStep(0.01);
+        label5 = new QLabel(QtGradientEditor);
+        label5->setObjectName(QString::fromUtf8("label5"));
+        label5->setGeometry(QRect(209, 189, 64, 23));
+        spinBox5 = new QDoubleSpinBox(QtGradientEditor);
+        spinBox5->setObjectName(QString::fromUtf8("spinBox5"));
+        spinBox5->setGeometry(QRect(279, 189, 73, 23));
+        spinBox5->setKeyboardTracking(false);
+        spinBox5->setDecimals(3);
+        spinBox5->setMaximum(1);
+        spinBox5->setSingleStep(0.01);
+        gradientStopsWidget = new QtGradientStopsWidget(QtGradientEditor);
+        gradientStopsWidget->setObjectName(QString::fromUtf8("gradientStopsWidget"));
+        gradientStopsWidget->setGeometry(QRect(10, 225, 193, 67));
+        zoomLabel = new QLabel(QtGradientEditor);
+        zoomLabel->setObjectName(QString::fromUtf8("zoomLabel"));
+        zoomLabel->setGeometry(QRect(209, 231, 64, 23));
+        zoomAllButton = new QToolButton(QtGradientEditor);
+        zoomAllButton->setObjectName(QString::fromUtf8("zoomAllButton"));
+        zoomAllButton->setGeometry(QRect(279, 260, 72, 26));
+        QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(zoomAllButton->sizePolicy().hasHeightForWidth());
+        zoomAllButton->setSizePolicy(sizePolicy1);
+        positionLabel = new QLabel(QtGradientEditor);
+        positionLabel->setObjectName(QString::fromUtf8("positionLabel"));
+        positionLabel->setGeometry(QRect(209, 304, 64, 23));
+        hLabel = new QLabel(QtGradientEditor);
+        hLabel->setObjectName(QString::fromUtf8("hLabel"));
+        hLabel->setGeometry(QRect(10, 335, 32, 18));
+        sizePolicy1.setHeightForWidth(hLabel->sizePolicy().hasHeightForWidth());
+        hLabel->setSizePolicy(sizePolicy1);
+        frame_2 = new QFrame(QtGradientEditor);
+        frame_2->setObjectName(QString::fromUtf8("frame_2"));
+        frame_2->setGeometry(QRect(48, 333, 155, 23));
+        QSizePolicy sizePolicy2(QSizePolicy::Ignored, QSizePolicy::Preferred);
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(frame_2->sizePolicy().hasHeightForWidth());
+        frame_2->setSizePolicy(sizePolicy2);
+        frame_2->setFrameShape(QFrame::StyledPanel);
+        frame_2->setFrameShadow(QFrame::Raised);
+        hboxLayout = new QHBoxLayout(frame_2);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
+        hueColorLine = new QtColorLine(frame_2);
+        hueColorLine->setObjectName(QString::fromUtf8("hueColorLine"));
+        QSizePolicy sizePolicy3(QSizePolicy::Expanding, QSizePolicy::Preferred);
+        sizePolicy3.setHorizontalStretch(0);
+        sizePolicy3.setVerticalStretch(0);
+        sizePolicy3.setHeightForWidth(hueColorLine->sizePolicy().hasHeightForWidth());
+        hueColorLine->setSizePolicy(sizePolicy3);
+
+        hboxLayout->addWidget(hueColorLine);
+
+        hueLabel = new QLabel(QtGradientEditor);
+        hueLabel->setObjectName(QString::fromUtf8("hueLabel"));
+        hueLabel->setGeometry(QRect(209, 335, 64, 18));
+        sizePolicy1.setHeightForWidth(hueLabel->sizePolicy().hasHeightForWidth());
+        hueLabel->setSizePolicy(sizePolicy1);
+        sLabel = new QLabel(QtGradientEditor);
+        sLabel->setObjectName(QString::fromUtf8("sLabel"));
+        sLabel->setGeometry(QRect(10, 364, 32, 18));
+        sizePolicy1.setHeightForWidth(sLabel->sizePolicy().hasHeightForWidth());
+        sLabel->setSizePolicy(sizePolicy1);
+        frame_5 = new QFrame(QtGradientEditor);
+        frame_5->setObjectName(QString::fromUtf8("frame_5"));
+        frame_5->setGeometry(QRect(48, 362, 155, 23));
+        sizePolicy2.setHeightForWidth(frame_5->sizePolicy().hasHeightForWidth());
+        frame_5->setSizePolicy(sizePolicy2);
+        frame_5->setFrameShape(QFrame::StyledPanel);
+        frame_5->setFrameShadow(QFrame::Raised);
+        hboxLayout1 = new QHBoxLayout(frame_5);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
+        saturationColorLine = new QtColorLine(frame_5);
+        saturationColorLine->setObjectName(QString::fromUtf8("saturationColorLine"));
+        sizePolicy3.setHeightForWidth(saturationColorLine->sizePolicy().hasHeightForWidth());
+        saturationColorLine->setSizePolicy(sizePolicy3);
+
+        hboxLayout1->addWidget(saturationColorLine);
+
+        saturationLabel = new QLabel(QtGradientEditor);
+        saturationLabel->setObjectName(QString::fromUtf8("saturationLabel"));
+        saturationLabel->setGeometry(QRect(209, 364, 64, 18));
+        sizePolicy1.setHeightForWidth(saturationLabel->sizePolicy().hasHeightForWidth());
+        saturationLabel->setSizePolicy(sizePolicy1);
+        vLabel = new QLabel(QtGradientEditor);
+        vLabel->setObjectName(QString::fromUtf8("vLabel"));
+        vLabel->setGeometry(QRect(10, 393, 32, 18));
+        sizePolicy1.setHeightForWidth(vLabel->sizePolicy().hasHeightForWidth());
+        vLabel->setSizePolicy(sizePolicy1);
+        frame_3 = new QFrame(QtGradientEditor);
+        frame_3->setObjectName(QString::fromUtf8("frame_3"));
+        frame_3->setGeometry(QRect(48, 391, 155, 23));
+        sizePolicy2.setHeightForWidth(frame_3->sizePolicy().hasHeightForWidth());
+        frame_3->setSizePolicy(sizePolicy2);
+        frame_3->setFrameShape(QFrame::StyledPanel);
+        frame_3->setFrameShadow(QFrame::Raised);
+        hboxLayout2 = new QHBoxLayout(frame_3);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
+        valueColorLine = new QtColorLine(frame_3);
+        valueColorLine->setObjectName(QString::fromUtf8("valueColorLine"));
+        sizePolicy3.setHeightForWidth(valueColorLine->sizePolicy().hasHeightForWidth());
+        valueColorLine->setSizePolicy(sizePolicy3);
+
+        hboxLayout2->addWidget(valueColorLine);
+
+        valueLabel = new QLabel(QtGradientEditor);
+        valueLabel->setObjectName(QString::fromUtf8("valueLabel"));
+        valueLabel->setGeometry(QRect(209, 393, 64, 18));
+        sizePolicy1.setHeightForWidth(valueLabel->sizePolicy().hasHeightForWidth());
+        valueLabel->setSizePolicy(sizePolicy1);
+        aLabel = new QLabel(QtGradientEditor);
+        aLabel->setObjectName(QString::fromUtf8("aLabel"));
+        aLabel->setGeometry(QRect(10, 422, 32, 18));
+        sizePolicy1.setHeightForWidth(aLabel->sizePolicy().hasHeightForWidth());
+        aLabel->setSizePolicy(sizePolicy1);
+        frame_4 = new QFrame(QtGradientEditor);
+        frame_4->setObjectName(QString::fromUtf8("frame_4"));
+        frame_4->setGeometry(QRect(48, 420, 155, 23));
+        sizePolicy2.setHeightForWidth(frame_4->sizePolicy().hasHeightForWidth());
+        frame_4->setSizePolicy(sizePolicy2);
+        frame_4->setFrameShape(QFrame::StyledPanel);
+        frame_4->setFrameShadow(QFrame::Raised);
+        hboxLayout3 = new QHBoxLayout(frame_4);
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
+        alphaColorLine = new QtColorLine(frame_4);
+        alphaColorLine->setObjectName(QString::fromUtf8("alphaColorLine"));
+        sizePolicy3.setHeightForWidth(alphaColorLine->sizePolicy().hasHeightForWidth());
+        alphaColorLine->setSizePolicy(sizePolicy3);
+
+        hboxLayout3->addWidget(alphaColorLine);
+
+        alphaLabel = new QLabel(QtGradientEditor);
+        alphaLabel->setObjectName(QString::fromUtf8("alphaLabel"));
+        alphaLabel->setGeometry(QRect(209, 422, 64, 18));
+        sizePolicy1.setHeightForWidth(alphaLabel->sizePolicy().hasHeightForWidth());
+        alphaLabel->setSizePolicy(sizePolicy1);
+        typeComboBox = new QComboBox(QtGradientEditor);
+        typeComboBox->setObjectName(QString::fromUtf8("typeComboBox"));
+        typeComboBox->setGeometry(QRect(10, 40, 79, 22));
+        spreadComboBox = new QComboBox(QtGradientEditor);
+        spreadComboBox->setObjectName(QString::fromUtf8("spreadComboBox"));
+        spreadComboBox->setGeometry(QRect(96, 40, 72, 22));
+        colorLabel = new QLabel(QtGradientEditor);
+        colorLabel->setObjectName(QString::fromUtf8("colorLabel"));
+        colorLabel->setGeometry(QRect(10, 298, 32, 29));
+        QSizePolicy sizePolicy4(QSizePolicy::Fixed, QSizePolicy::Preferred);
+        sizePolicy4.setHorizontalStretch(0);
+        sizePolicy4.setVerticalStretch(0);
+        sizePolicy4.setHeightForWidth(colorLabel->sizePolicy().hasHeightForWidth());
+        colorLabel->setSizePolicy(sizePolicy4);
+        colorButton = new QtColorButton(QtGradientEditor);
+        colorButton->setObjectName(QString::fromUtf8("colorButton"));
+        colorButton->setGeometry(QRect(48, 300, 26, 25));
+        hsvRadioButton = new QRadioButton(QtGradientEditor);
+        hsvRadioButton->setObjectName(QString::fromUtf8("hsvRadioButton"));
+        hsvRadioButton->setGeometry(QRect(80, 301, 49, 23));
+        QSizePolicy sizePolicy5(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy5.setHorizontalStretch(0);
+        sizePolicy5.setVerticalStretch(0);
+        sizePolicy5.setHeightForWidth(hsvRadioButton->sizePolicy().hasHeightForWidth());
+        hsvRadioButton->setSizePolicy(sizePolicy5);
+        hsvRadioButton->setChecked(true);
+        rgbRadioButton = new QRadioButton(QtGradientEditor);
+        rgbRadioButton->setObjectName(QString::fromUtf8("rgbRadioButton"));
+        rgbRadioButton->setGeometry(QRect(135, 301, 49, 23));
+        sizePolicy5.setHeightForWidth(rgbRadioButton->sizePolicy().hasHeightForWidth());
+        rgbRadioButton->setSizePolicy(sizePolicy5);
+        positionWidget = new QWidget(QtGradientEditor);
+        positionWidget->setObjectName(QString::fromUtf8("positionWidget"));
+        positionWidget->setGeometry(QRect(279, 304, 73, 23));
+        vboxLayout1 = new QVBoxLayout(positionWidget);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
+        positionSpinBox = new QDoubleSpinBox(positionWidget);
+        positionSpinBox->setObjectName(QString::fromUtf8("positionSpinBox"));
+        positionSpinBox->setKeyboardTracking(false);
+        positionSpinBox->setDecimals(3);
+        positionSpinBox->setMinimum(0);
+        positionSpinBox->setMaximum(1);
+        positionSpinBox->setSingleStep(0.01);
+        positionSpinBox->setValue(0);
+
+        vboxLayout1->addWidget(positionSpinBox);
+
+        hueWidget = new QWidget(QtGradientEditor);
+        hueWidget->setObjectName(QString::fromUtf8("hueWidget"));
+        hueWidget->setGeometry(QRect(279, 333, 73, 23));
+        vboxLayout2 = new QVBoxLayout(hueWidget);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
+        hueSpinBox = new QSpinBox(hueWidget);
+        hueSpinBox->setObjectName(QString::fromUtf8("hueSpinBox"));
+        hueSpinBox->setKeyboardTracking(false);
+        hueSpinBox->setMaximum(359);
+
+        vboxLayout2->addWidget(hueSpinBox);
+
+        saturationWidget = new QWidget(QtGradientEditor);
+        saturationWidget->setObjectName(QString::fromUtf8("saturationWidget"));
+        saturationWidget->setGeometry(QRect(279, 362, 73, 23));
+        vboxLayout3 = new QVBoxLayout(saturationWidget);
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        vboxLayout3->setContentsMargins(0, 0, 0, 0);
+        saturationSpinBox = new QSpinBox(saturationWidget);
+        saturationSpinBox->setObjectName(QString::fromUtf8("saturationSpinBox"));
+        saturationSpinBox->setKeyboardTracking(false);
+        saturationSpinBox->setMaximum(255);
+
+        vboxLayout3->addWidget(saturationSpinBox);
+
+        valueWidget = new QWidget(QtGradientEditor);
+        valueWidget->setObjectName(QString::fromUtf8("valueWidget"));
+        valueWidget->setGeometry(QRect(279, 391, 73, 23));
+        vboxLayout4 = new QVBoxLayout(valueWidget);
+        vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
+        vboxLayout4->setContentsMargins(0, 0, 0, 0);
+        valueSpinBox = new QSpinBox(valueWidget);
+        valueSpinBox->setObjectName(QString::fromUtf8("valueSpinBox"));
+        valueSpinBox->setKeyboardTracking(false);
+        valueSpinBox->setMaximum(255);
+
+        vboxLayout4->addWidget(valueSpinBox);
+
+        alphaWidget = new QWidget(QtGradientEditor);
+        alphaWidget->setObjectName(QString::fromUtf8("alphaWidget"));
+        alphaWidget->setGeometry(QRect(279, 420, 73, 23));
+        vboxLayout5 = new QVBoxLayout(alphaWidget);
+        vboxLayout5->setObjectName(QString::fromUtf8("vboxLayout5"));
+        vboxLayout5->setContentsMargins(0, 0, 0, 0);
+        alphaSpinBox = new QSpinBox(alphaWidget);
+        alphaSpinBox->setObjectName(QString::fromUtf8("alphaSpinBox"));
+        alphaSpinBox->setKeyboardTracking(false);
+        alphaSpinBox->setMaximum(255);
+
+        vboxLayout5->addWidget(alphaSpinBox);
+
+        zoomWidget = new QWidget(QtGradientEditor);
+        zoomWidget->setObjectName(QString::fromUtf8("zoomWidget"));
+        zoomWidget->setGeometry(QRect(279, 231, 73, 23));
+        vboxLayout6 = new QVBoxLayout(zoomWidget);
+        vboxLayout6->setObjectName(QString::fromUtf8("vboxLayout6"));
+        vboxLayout6->setContentsMargins(0, 0, 0, 0);
+        zoomSpinBox = new QSpinBox(zoomWidget);
+        zoomSpinBox->setObjectName(QString::fromUtf8("zoomSpinBox"));
+        zoomSpinBox->setKeyboardTracking(false);
+        zoomSpinBox->setMinimum(100);
+        zoomSpinBox->setMaximum(10000);
+        zoomSpinBox->setSingleStep(100);
+        zoomSpinBox->setValue(100);
+
+        vboxLayout6->addWidget(zoomSpinBox);
+
+        line1Widget = new QWidget(QtGradientEditor);
+        line1Widget->setObjectName(QString::fromUtf8("line1Widget"));
+        line1Widget->setGeometry(QRect(209, 219, 143, 16));
+        vboxLayout7 = new QVBoxLayout(line1Widget);
+        vboxLayout7->setObjectName(QString::fromUtf8("vboxLayout7"));
+        vboxLayout7->setContentsMargins(0, 0, 0, 0);
+        line1 = new QFrame(line1Widget);
+        line1->setObjectName(QString::fromUtf8("line1"));
+        line1->setFrameShape(QFrame::HLine);
+        line1->setFrameShadow(QFrame::Sunken);
+
+        vboxLayout7->addWidget(line1);
+
+        line2Widget = new QWidget(QtGradientEditor);
+        line2Widget->setObjectName(QString::fromUtf8("line2Widget"));
+        line2Widget->setGeometry(QRect(209, 292, 143, 16));
+        vboxLayout8 = new QVBoxLayout(line2Widget);
+        vboxLayout8->setObjectName(QString::fromUtf8("vboxLayout8"));
+        vboxLayout8->setContentsMargins(0, 0, 0, 0);
+        line2 = new QFrame(line2Widget);
+        line2->setObjectName(QString::fromUtf8("line2"));
+        line2->setFrameShape(QFrame::HLine);
+        line2->setFrameShadow(QFrame::Sunken);
+
+        vboxLayout8->addWidget(line2);
+
+        zoomButtonsWidget = new QWidget(QtGradientEditor);
+        zoomButtonsWidget->setObjectName(QString::fromUtf8("zoomButtonsWidget"));
+        zoomButtonsWidget->setGeometry(QRect(209, 260, 64, 26));
+        QSizePolicy sizePolicy6(QSizePolicy::Maximum, QSizePolicy::Preferred);
+        sizePolicy6.setHorizontalStretch(0);
+        sizePolicy6.setVerticalStretch(0);
+        sizePolicy6.setHeightForWidth(zoomButtonsWidget->sizePolicy().hasHeightForWidth());
+        zoomButtonsWidget->setSizePolicy(sizePolicy6);
+        hboxLayout4 = new QHBoxLayout(zoomButtonsWidget);
+        hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
+        zoomInButton = new QToolButton(zoomButtonsWidget);
+        zoomInButton->setObjectName(QString::fromUtf8("zoomInButton"));
+
+        hboxLayout4->addWidget(zoomInButton);
+
+        zoomOutButton = new QToolButton(zoomButtonsWidget);
+        zoomOutButton->setObjectName(QString::fromUtf8("zoomOutButton"));
+
+        hboxLayout4->addWidget(zoomOutButton);
+
+        spacerItem = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout4->addItem(spacerItem);
+
+        detailsButton = new QToolButton(QtGradientEditor);
+        detailsButton->setObjectName(QString::fromUtf8("detailsButton"));
+        detailsButton->setGeometry(QRect(176, 40, 25, 22));
+        QSizePolicy sizePolicy7(QSizePolicy::Fixed, QSizePolicy::Ignored);
+        sizePolicy7.setHorizontalStretch(0);
+        sizePolicy7.setVerticalStretch(0);
+        sizePolicy7.setHeightForWidth(detailsButton->sizePolicy().hasHeightForWidth());
+        detailsButton->setSizePolicy(sizePolicy7);
+        detailsButton->setCheckable(true);
+        detailsButton->setAutoRaise(true);
+        linearButton = new QToolButton(QtGradientEditor);
+        linearButton->setObjectName(QString::fromUtf8("linearButton"));
+        linearButton->setGeometry(QRect(10, 10, 30, 26));
+        linearButton->setCheckable(true);
+        linearButton->setAutoRaise(true);
+        radialButton = new QToolButton(QtGradientEditor);
+        radialButton->setObjectName(QString::fromUtf8("radialButton"));
+        radialButton->setGeometry(QRect(40, 10, 30, 26));
+        radialButton->setCheckable(true);
+        radialButton->setAutoRaise(true);
+        conicalButton = new QToolButton(QtGradientEditor);
+        conicalButton->setObjectName(QString::fromUtf8("conicalButton"));
+        conicalButton->setGeometry(QRect(70, 10, 30, 26));
+        conicalButton->setCheckable(true);
+        conicalButton->setAutoRaise(true);
+        padButton = new QToolButton(QtGradientEditor);
+        padButton->setObjectName(QString::fromUtf8("padButton"));
+        padButton->setGeometry(QRect(110, 10, 30, 26));
+        padButton->setCheckable(true);
+        padButton->setAutoRaise(true);
+        repeatButton = new QToolButton(QtGradientEditor);
+        repeatButton->setObjectName(QString::fromUtf8("repeatButton"));
+        repeatButton->setGeometry(QRect(140, 10, 30, 26));
+        repeatButton->setCheckable(true);
+        repeatButton->setAutoRaise(true);
+        reflectButton = new QToolButton(QtGradientEditor);
+        reflectButton->setObjectName(QString::fromUtf8("reflectButton"));
+        reflectButton->setGeometry(QRect(170, 10, 30, 26));
+        reflectButton->setCheckable(true);
+        reflectButton->setAutoRaise(true);
+        QWidget::setTabOrder(typeComboBox, spreadComboBox);
+        QWidget::setTabOrder(spreadComboBox, detailsButton);
+        QWidget::setTabOrder(detailsButton, spinBox1);
+        QWidget::setTabOrder(spinBox1, spinBox2);
+        QWidget::setTabOrder(spinBox2, spinBox3);
+        QWidget::setTabOrder(spinBox3, spinBox4);
+        QWidget::setTabOrder(spinBox4, spinBox5);
+        QWidget::setTabOrder(spinBox5, zoomSpinBox);
+        QWidget::setTabOrder(zoomSpinBox, zoomInButton);
+        QWidget::setTabOrder(zoomInButton, zoomOutButton);
+        QWidget::setTabOrder(zoomOutButton, zoomAllButton);
+        QWidget::setTabOrder(zoomAllButton, colorButton);
+        QWidget::setTabOrder(colorButton, hsvRadioButton);
+        QWidget::setTabOrder(hsvRadioButton, rgbRadioButton);
+        QWidget::setTabOrder(rgbRadioButton, positionSpinBox);
+        QWidget::setTabOrder(positionSpinBox, hueSpinBox);
+        QWidget::setTabOrder(hueSpinBox, saturationSpinBox);
+        QWidget::setTabOrder(saturationSpinBox, valueSpinBox);
+        QWidget::setTabOrder(valueSpinBox, alphaSpinBox);
+
+        retranslateUi(QtGradientEditor);
+
+        QMetaObject::connectSlotsByName(QtGradientEditor);
+    } // setupUi
+
+    void retranslateUi(QWidget *QtGradientEditor)
+    {
+        QtGradientEditor->setWindowTitle(QApplication::translate("QtGradientEditor", "Form", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        gradientWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Editor", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        gradientWidget->setWhatsThis(QApplication::translate("QtGradientEditor", "This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        label1->setText(QApplication::translate("QtGradientEditor", "1", 0, QApplication::UnicodeUTF8));
+        label2->setText(QApplication::translate("QtGradientEditor", "2", 0, QApplication::UnicodeUTF8));
+        label3->setText(QApplication::translate("QtGradientEditor", "3", 0, QApplication::UnicodeUTF8));
+        label4->setText(QApplication::translate("QtGradientEditor", "4", 0, QApplication::UnicodeUTF8));
+        label5->setText(QApplication::translate("QtGradientEditor", "5", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        gradientStopsWidget->setToolTip(QApplication::translate("QtGradientEditor", "Gradient Stops Editor", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_WHATSTHIS
+        gradientStopsWidget->setWhatsThis(QApplication::translate("QtGradientEditor", "This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        zoomLabel->setText(QApplication::translate("QtGradientEditor", "Zoom", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        zoomAllButton->setToolTip(QApplication::translate("QtGradientEditor", "Reset Zoom", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        zoomAllButton->setText(QApplication::translate("QtGradientEditor", "Reset Zoom", 0, QApplication::UnicodeUTF8));
+        positionLabel->setText(QApplication::translate("QtGradientEditor", "Position", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        hLabel->setToolTip(QApplication::translate("QtGradientEditor", "Hue", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        hLabel->setText(QApplication::translate("QtGradientEditor", "H", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        hueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Hue", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        hueLabel->setText(QApplication::translate("QtGradientEditor", "Hue", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        sLabel->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        sLabel->setText(QApplication::translate("QtGradientEditor", "S", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        saturationColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Saturation", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        saturationLabel->setText(QApplication::translate("QtGradientEditor", "Sat", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        vLabel->setToolTip(QApplication::translate("QtGradientEditor", "Value", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        vLabel->setText(QApplication::translate("QtGradientEditor", "V", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        valueColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Value", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        valueLabel->setText(QApplication::translate("QtGradientEditor", "Val", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        aLabel->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        aLabel->setText(QApplication::translate("QtGradientEditor", "A", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        alphaColorLine->setToolTip(QApplication::translate("QtGradientEditor", "Alpha", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        alphaLabel->setText(QApplication::translate("QtGradientEditor", "Alpha", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        typeComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Type", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        spreadComboBox->setToolTip(QApplication::translate("QtGradientEditor", "Spread", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        colorLabel->setText(QApplication::translate("QtGradientEditor", "Color", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        colorButton->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's color", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        colorButton->setText(QString());
+#ifndef QT_NO_TOOLTIP
+        hsvRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show HSV specification", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        hsvRadioButton->setText(QApplication::translate("QtGradientEditor", "HSV", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        rgbRadioButton->setToolTip(QApplication::translate("QtGradientEditor", "Show RGB specification", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        rgbRadioButton->setText(QApplication::translate("QtGradientEditor", "RGB", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        positionSpinBox->setToolTip(QApplication::translate("QtGradientEditor", "Current stop's position", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        zoomSpinBox->setSuffix(QApplication::translate("QtGradientEditor", "%", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        zoomInButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom In", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        zoomOutButton->setToolTip(QApplication::translate("QtGradientEditor", "Zoom Out", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        detailsButton->setToolTip(QApplication::translate("QtGradientEditor", "Toggle details extension", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        detailsButton->setText(QApplication::translate("QtGradientEditor", ">", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        linearButton->setToolTip(QApplication::translate("QtGradientEditor", "Linear Type", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        linearButton->setText(QApplication::translate("QtGradientEditor", "...", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        radialButton->setToolTip(QApplication::translate("QtGradientEditor", "Radial Type", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        radialButton->setText(QApplication::translate("QtGradientEditor", "...", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        conicalButton->setToolTip(QApplication::translate("QtGradientEditor", "Conical Type", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        conicalButton->setText(QApplication::translate("QtGradientEditor", "...", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        padButton->setToolTip(QApplication::translate("QtGradientEditor", "Pad Spread", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        padButton->setText(QApplication::translate("QtGradientEditor", "...", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        repeatButton->setToolTip(QApplication::translate("QtGradientEditor", "Repeat Spread", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        repeatButton->setText(QApplication::translate("QtGradientEditor", "...", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        reflectButton->setToolTip(QApplication::translate("QtGradientEditor", "Reflect Spread", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        reflectButton->setText(QApplication::translate("QtGradientEditor", "...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QtGradientEditor);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QtGradientEditor: public Ui_QtGradientEditor {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QTGRADIENTEDITOR_H
diff --git a/tests/auto/uic/baseline/qtgradientview.ui b/tests/auto/uic/baseline/qtgradientview.ui
new file mode 100644
index 0000000..af7267e
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradientview.ui
@@ -0,0 +1,135 @@
+<ui version="4.0" >
+ <class>QtGradientView</class>
+ <widget class="QWidget" name="QtGradientView" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>484</width>
+    <height>228</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Gradient View</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QToolButton" name="newButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>New...</string>
+       </property>
+       <property name="toolButtonStyle" >
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
+       <property name="autoRaise" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="editButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Edit...</string>
+       </property>
+       <property name="toolButtonStyle" >
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
+       <property name="autoRaise" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="renameButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Rename</string>
+       </property>
+       <property name="toolButtonStyle" >
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
+       <property name="autoRaise" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="removeButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Remove</string>
+       </property>
+       <property name="toolButtonStyle" >
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
+       <property name="autoRaise" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>71</width>
+         <height>26</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QListWidget" name="listWidget" />
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>listWidget</tabstop>
+  <tabstop>newButton</tabstop>
+  <tabstop>editButton</tabstop>
+  <tabstop>renameButton</tabstop>
+  <tabstop>removeButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qtgradientview.ui.h b/tests/auto/uic/baseline/qtgradientview.ui.h
new file mode 100644
index 0000000..6be5ed5
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradientview.ui.h
@@ -0,0 +1,128 @@
+/********************************************************************************
+** Form generated from reading ui file 'qtgradientview.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QTGRADIENTVIEW_H
+#define QTGRADIENTVIEW_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QtGradientView
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    QToolButton *newButton;
+    QToolButton *editButton;
+    QToolButton *renameButton;
+    QToolButton *removeButton;
+    QSpacerItem *spacerItem;
+    QListWidget *listWidget;
+
+    void setupUi(QWidget *QtGradientView)
+    {
+        if (QtGradientView->objectName().isEmpty())
+            QtGradientView->setObjectName(QString::fromUtf8("QtGradientView"));
+        QtGradientView->resize(484, 228);
+        vboxLayout = new QVBoxLayout(QtGradientView);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        newButton = new QToolButton(QtGradientView);
+        newButton->setObjectName(QString::fromUtf8("newButton"));
+        QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(newButton->sizePolicy().hasHeightForWidth());
+        newButton->setSizePolicy(sizePolicy);
+        newButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        newButton->setAutoRaise(true);
+
+        hboxLayout->addWidget(newButton);
+
+        editButton = new QToolButton(QtGradientView);
+        editButton->setObjectName(QString::fromUtf8("editButton"));
+        sizePolicy.setHeightForWidth(editButton->sizePolicy().hasHeightForWidth());
+        editButton->setSizePolicy(sizePolicy);
+        editButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        editButton->setAutoRaise(true);
+
+        hboxLayout->addWidget(editButton);
+
+        renameButton = new QToolButton(QtGradientView);
+        renameButton->setObjectName(QString::fromUtf8("renameButton"));
+        sizePolicy.setHeightForWidth(renameButton->sizePolicy().hasHeightForWidth());
+        renameButton->setSizePolicy(sizePolicy);
+        renameButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        renameButton->setAutoRaise(true);
+
+        hboxLayout->addWidget(renameButton);
+
+        removeButton = new QToolButton(QtGradientView);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+        sizePolicy.setHeightForWidth(removeButton->sizePolicy().hasHeightForWidth());
+        removeButton->setSizePolicy(sizePolicy);
+        removeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        removeButton->setAutoRaise(true);
+
+        hboxLayout->addWidget(removeButton);
+
+        spacerItem = new QSpacerItem(71, 26, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        listWidget = new QListWidget(QtGradientView);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+
+        vboxLayout->addWidget(listWidget);
+
+        QWidget::setTabOrder(listWidget, newButton);
+        QWidget::setTabOrder(newButton, editButton);
+        QWidget::setTabOrder(editButton, renameButton);
+        QWidget::setTabOrder(renameButton, removeButton);
+
+        retranslateUi(QtGradientView);
+
+        QMetaObject::connectSlotsByName(QtGradientView);
+    } // setupUi
+
+    void retranslateUi(QWidget *QtGradientView)
+    {
+        QtGradientView->setWindowTitle(QApplication::translate("QtGradientView", "Gradient View", 0, QApplication::UnicodeUTF8));
+        newButton->setText(QApplication::translate("QtGradientView", "New...", 0, QApplication::UnicodeUTF8));
+        editButton->setText(QApplication::translate("QtGradientView", "Edit...", 0, QApplication::UnicodeUTF8));
+        renameButton->setText(QApplication::translate("QtGradientView", "Rename", 0, QApplication::UnicodeUTF8));
+        removeButton->setText(QApplication::translate("QtGradientView", "Remove", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QtGradientView);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QtGradientView: public Ui_QtGradientView {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QTGRADIENTVIEW_H
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui b/tests/auto/uic/baseline/qtgradientviewdialog.ui
new file mode 100644
index 0000000..486cd5d
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui
@@ -0,0 +1,120 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>QtGradientViewDialog</class>
+ <widget class="QDialog" name="QtGradientViewDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>178</width>
+    <height>72</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Select Gradient</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QtGradientView" name="gradientView" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QtGradientView</class>
+   <extends>QFrame</extends>
+   <header>qtgradientview.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>QtGradientViewDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>72</x>
+     <y>224</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>21</x>
+     <y>243</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>QtGradientViewDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>168</x>
+     <y>233</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>152</x>
+     <y>251</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
new file mode 100644
index 0000000..8836301
--- /dev/null
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
@@ -0,0 +1,120 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'qtgradientviewdialog.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QTGRADIENTVIEWDIALOG_H
+#define QTGRADIENTVIEWDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QVBoxLayout>
+#include "qtgradientview.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QtGradientViewDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QtGradientView *gradientView;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *QtGradientViewDialog)
+    {
+        if (QtGradientViewDialog->objectName().isEmpty())
+            QtGradientViewDialog->setObjectName(QString::fromUtf8("QtGradientViewDialog"));
+        QtGradientViewDialog->resize(178, 72);
+        vboxLayout = new QVBoxLayout(QtGradientViewDialog);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        gradientView = new QtGradientView(QtGradientViewDialog);
+        gradientView->setObjectName(QString::fromUtf8("gradientView"));
+        QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(gradientView->sizePolicy().hasHeightForWidth());
+        gradientView->setSizePolicy(sizePolicy);
+
+        vboxLayout->addWidget(gradientView);
+
+        buttonBox = new QDialogButtonBox(QtGradientViewDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(QtGradientViewDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), QtGradientViewDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), QtGradientViewDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(QtGradientViewDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *QtGradientViewDialog)
+    {
+        QtGradientViewDialog->setWindowTitle(QApplication::translate("QtGradientViewDialog", "Select Gradient", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QtGradientViewDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QtGradientViewDialog: public Ui_QtGradientViewDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QTGRADIENTVIEWDIALOG_H
diff --git a/tests/auto/uic/baseline/qtresourceeditordialog.ui b/tests/auto/uic/baseline/qtresourceeditordialog.ui
new file mode 100644
index 0000000..2205da4
--- /dev/null
+++ b/tests/auto/uic/baseline/qtresourceeditordialog.ui
@@ -0,0 +1,180 @@
+<ui version="4.0" >
+ <class>QtResourceEditorDialog</class>
+ <widget class="QDialog" name="QtResourceEditorDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>469</width>
+    <height>317</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <widget class="QSplitter" name="splitter" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QWidget" name="layoutWidget" >
+      <layout class="QGridLayout" >
+       <item row="0" column="0" colspan="4" >
+        <widget class="QListWidget" name="qrcFileList" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Expanding" hsizetype="Ignored" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QToolButton" name="newQrcButton" >
+         <property name="toolTip" >
+          <string>New File</string>
+         </property>
+         <property name="text" >
+          <string>N</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QToolButton" name="removeQrcButton" >
+         <property name="toolTip" >
+          <string>Remove File</string>
+         </property>
+         <property name="text" >
+          <string>R</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="3" >
+        <spacer>
+         <property name="spacerName" stdset="0" >
+          <string/>
+         </property>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Ignored</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>21</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QToolButton" name="importQrcButton" >
+         <property name="text" >
+          <string>I</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="" >
+      <layout class="QGridLayout" >
+       <item row="0" column="0" colspan="4" >
+        <widget class="QTreeView" name="resourceTreeView" />
+       </item>
+       <item row="1" column="0" >
+        <widget class="QToolButton" name="newResourceButton" >
+         <property name="toolTip" >
+          <string>New Resource</string>
+         </property>
+         <property name="text" >
+          <string>N</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QToolButton" name="addResourceButton" >
+         <property name="text" >
+          <string>A</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QToolButton" name="removeResourceButton" >
+         <property name="toolTip" >
+          <string>Remove Resource or File</string>
+         </property>
+         <property name="text" >
+          <string>R</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="3" >
+        <spacer name="horizontalSpacer" >
+         <property name="spacerName" stdset="0" >
+          <string>horizontalSpacer</string>
+         </property>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>QtResourceEditorDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>QtResourceEditorDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
new file mode 100644
index 0000000..03e7362
--- /dev/null
+++ b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
@@ -0,0 +1,177 @@
+/********************************************************************************
+** Form generated from reading ui file 'qtresourceeditordialog.ui'
+**
+** Created: Mon Jun 16 17:45:38 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QTRESOURCEEDITORDIALOG_H
+#define QTRESOURCEEDITORDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSplitter>
+#include <QtGui/QToolButton>
+#include <QtGui/QTreeView>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QtResourceEditorDialog
+{
+public:
+    QVBoxLayout *verticalLayout;
+    QSplitter *splitter;
+    QWidget *layoutWidget;
+    QGridLayout *gridLayout;
+    QListWidget *qrcFileList;
+    QToolButton *newQrcButton;
+    QToolButton *removeQrcButton;
+    QSpacerItem *spacerItem;
+    QToolButton *importQrcButton;
+    QWidget *widget;
+    QGridLayout *gridLayout1;
+    QTreeView *resourceTreeView;
+    QToolButton *newResourceButton;
+    QToolButton *addResourceButton;
+    QToolButton *removeResourceButton;
+    QSpacerItem *horizontalSpacer;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *QtResourceEditorDialog)
+    {
+        if (QtResourceEditorDialog->objectName().isEmpty())
+            QtResourceEditorDialog->setObjectName(QString::fromUtf8("QtResourceEditorDialog"));
+        QtResourceEditorDialog->resize(469, 317);
+        verticalLayout = new QVBoxLayout(QtResourceEditorDialog);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        splitter = new QSplitter(QtResourceEditorDialog);
+        splitter->setObjectName(QString::fromUtf8("splitter"));
+        splitter->setOrientation(Qt::Horizontal);
+        layoutWidget = new QWidget(splitter);
+        layoutWidget->setObjectName(QString::fromUtf8("layoutWidget"));
+        gridLayout = new QGridLayout(layoutWidget);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setContentsMargins(0, 0, 0, 0);
+        qrcFileList = new QListWidget(layoutWidget);
+        qrcFileList->setObjectName(QString::fromUtf8("qrcFileList"));
+        QSizePolicy sizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(qrcFileList->sizePolicy().hasHeightForWidth());
+        qrcFileList->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(qrcFileList, 0, 0, 1, 4);
+
+        newQrcButton = new QToolButton(layoutWidget);
+        newQrcButton->setObjectName(QString::fromUtf8("newQrcButton"));
+
+        gridLayout->addWidget(newQrcButton, 1, 0, 1, 1);
+
+        removeQrcButton = new QToolButton(layoutWidget);
+        removeQrcButton->setObjectName(QString::fromUtf8("removeQrcButton"));
+
+        gridLayout->addWidget(removeQrcButton, 1, 2, 1, 1);
+
+        spacerItem = new QSpacerItem(21, 20, QSizePolicy::Ignored, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 1, 3, 1, 1);
+
+        importQrcButton = new QToolButton(layoutWidget);
+        importQrcButton->setObjectName(QString::fromUtf8("importQrcButton"));
+
+        gridLayout->addWidget(importQrcButton, 1, 1, 1, 1);
+
+        splitter->addWidget(layoutWidget);
+        widget = new QWidget(splitter);
+        widget->setObjectName(QString::fromUtf8("widget"));
+        gridLayout1 = new QGridLayout(widget);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        gridLayout1->setContentsMargins(0, 0, 0, 0);
+        resourceTreeView = new QTreeView(widget);
+        resourceTreeView->setObjectName(QString::fromUtf8("resourceTreeView"));
+
+        gridLayout1->addWidget(resourceTreeView, 0, 0, 1, 4);
+
+        newResourceButton = new QToolButton(widget);
+        newResourceButton->setObjectName(QString::fromUtf8("newResourceButton"));
+
+        gridLayout1->addWidget(newResourceButton, 1, 0, 1, 1);
+
+        addResourceButton = new QToolButton(widget);
+        addResourceButton->setObjectName(QString::fromUtf8("addResourceButton"));
+
+        gridLayout1->addWidget(addResourceButton, 1, 1, 1, 1);
+
+        removeResourceButton = new QToolButton(widget);
+        removeResourceButton->setObjectName(QString::fromUtf8("removeResourceButton"));
+
+        gridLayout1->addWidget(removeResourceButton, 1, 2, 1, 1);
+
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout1->addItem(horizontalSpacer, 1, 3, 1, 1);
+
+        splitter->addWidget(widget);
+
+        verticalLayout->addWidget(splitter);
+
+        buttonBox = new QDialogButtonBox(QtResourceEditorDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        verticalLayout->addWidget(buttonBox);
+
+
+        retranslateUi(QtResourceEditorDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), QtResourceEditorDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), QtResourceEditorDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(QtResourceEditorDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *QtResourceEditorDialog)
+    {
+        QtResourceEditorDialog->setWindowTitle(QApplication::translate("QtResourceEditorDialog", "Dialog", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        newQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New File", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "N", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        removeQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove File", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        removeQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "R", 0, QApplication::UnicodeUTF8));
+        importQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "I", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        newResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New Resource", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "N", 0, QApplication::UnicodeUTF8));
+        addResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "A", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QtResourceEditorDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QtResourceEditorDialog: public Ui_QtResourceEditorDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QTRESOURCEEDITORDIALOG_H
diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui b/tests/auto/uic/baseline/qttoolbardialog.ui
new file mode 100644
index 0000000..c4ad934
--- /dev/null
+++ b/tests/auto/uic/baseline/qttoolbardialog.ui
@@ -0,0 +1,207 @@
+<ui version="4.0" >
+ <class>QtToolBarDialog</class>
+ <widget class="QDialog" name="QtToolBarDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>583</width>
+    <height>508</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Customize Toolbars</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="3" row="1" column="0" >
+    <widget class="QTreeWidget" name="actionTree" >
+     <column>
+      <property name="text" >
+       <string>1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Actions</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>Toolbars</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="newButton" >
+       <property name="toolTip" >
+        <string>Add new toolbar</string>
+       </property>
+       <property name="text" >
+        <string>New</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="removeButton" >
+       <property name="toolTip" >
+        <string>Remove selected toolbar</string>
+       </property>
+       <property name="text" >
+        <string>Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="renameButton" >
+       <property name="toolTip" >
+        <string>Rename toolbar</string>
+       </property>
+       <property name="text" >
+        <string>Rename</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="1" >
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QToolButton" name="upButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>Move action up</string>
+       </property>
+       <property name="text" >
+        <string>Up</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="leftButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>Remove action from toolbar</string>
+       </property>
+       <property name="text" >
+        <string>&lt;-</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="rightButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>Add action to toolbar</string>
+       </property>
+       <property name="text" >
+        <string>-></string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="downButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>Move action down</string>
+       </property>
+       <property name="text" >
+        <string>Down</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>29</width>
+         <height>16</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="2" >
+    <widget class="QListWidget" name="currentToolBarList" />
+   </item>
+   <item row="2" column="1" colspan="2" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Current Toolbar Actions</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2" >
+    <widget class="QListWidget" name="toolBarList" />
+   </item>
+   <item row="5" column="0" colspan="3" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>newButton</tabstop>
+  <tabstop>removeButton</tabstop>
+  <tabstop>renameButton</tabstop>
+  <tabstop>toolBarList</tabstop>
+  <tabstop>upButton</tabstop>
+  <tabstop>leftButton</tabstop>
+  <tabstop>rightButton</tabstop>
+  <tabstop>downButton</tabstop>
+  <tabstop>currentToolBarList</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui.h b/tests/auto/uic/baseline/qttoolbardialog.ui.h
new file mode 100644
index 0000000..3b487c3
--- /dev/null
+++ b/tests/auto/uic/baseline/qttoolbardialog.ui.h
@@ -0,0 +1,229 @@
+/********************************************************************************
+** Form generated from reading ui file 'qttoolbardialog.ui'
+**
+** Created: Mon Jun 16 17:42:37 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QTTOOLBARDIALOG_H
+#define QTTOOLBARDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QtToolBarDialog
+{
+public:
+    QGridLayout *gridLayout;
+    QTreeWidget *actionTree;
+    QLabel *label;
+    QHBoxLayout *hboxLayout;
+    QLabel *label_2;
+    QToolButton *newButton;
+    QToolButton *removeButton;
+    QToolButton *renameButton;
+    QVBoxLayout *vboxLayout;
+    QToolButton *upButton;
+    QToolButton *leftButton;
+    QToolButton *rightButton;
+    QToolButton *downButton;
+    QSpacerItem *spacerItem;
+    QListWidget *currentToolBarList;
+    QLabel *label_3;
+    QListWidget *toolBarList;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *QtToolBarDialog)
+    {
+        if (QtToolBarDialog->objectName().isEmpty())
+            QtToolBarDialog->setObjectName(QString::fromUtf8("QtToolBarDialog"));
+        QtToolBarDialog->resize(583, 508);
+        gridLayout = new QGridLayout(QtToolBarDialog);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+        gridLayout->setMargin(8);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        actionTree = new QTreeWidget(QtToolBarDialog);
+        actionTree->setObjectName(QString::fromUtf8("actionTree"));
+
+        gridLayout->addWidget(actionTree, 1, 0, 3, 1);
+
+        label = new QLabel(QtToolBarDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        label_2 = new QLabel(QtToolBarDialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        hboxLayout->addWidget(label_2);
+
+        newButton = new QToolButton(QtToolBarDialog);
+        newButton->setObjectName(QString::fromUtf8("newButton"));
+
+        hboxLayout->addWidget(newButton);
+
+        removeButton = new QToolButton(QtToolBarDialog);
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
+
+        hboxLayout->addWidget(removeButton);
+
+        renameButton = new QToolButton(QtToolBarDialog);
+        renameButton->setObjectName(QString::fromUtf8("renameButton"));
+
+        hboxLayout->addWidget(renameButton);
+
+
+        gridLayout->addLayout(hboxLayout, 0, 1, 1, 2);
+
+        vboxLayout = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(0);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        upButton = new QToolButton(QtToolBarDialog);
+        upButton->setObjectName(QString::fromUtf8("upButton"));
+        QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(upButton->sizePolicy().hasHeightForWidth());
+        upButton->setSizePolicy(sizePolicy);
+
+        vboxLayout->addWidget(upButton);
+
+        leftButton = new QToolButton(QtToolBarDialog);
+        leftButton->setObjectName(QString::fromUtf8("leftButton"));
+        sizePolicy.setHeightForWidth(leftButton->sizePolicy().hasHeightForWidth());
+        leftButton->setSizePolicy(sizePolicy);
+
+        vboxLayout->addWidget(leftButton);
+
+        rightButton = new QToolButton(QtToolBarDialog);
+        rightButton->setObjectName(QString::fromUtf8("rightButton"));
+        sizePolicy.setHeightForWidth(rightButton->sizePolicy().hasHeightForWidth());
+        rightButton->setSizePolicy(sizePolicy);
+
+        vboxLayout->addWidget(rightButton);
+
+        downButton = new QToolButton(QtToolBarDialog);
+        downButton->setObjectName(QString::fromUtf8("downButton"));
+        sizePolicy.setHeightForWidth(downButton->sizePolicy().hasHeightForWidth());
+        downButton->setSizePolicy(sizePolicy);
+
+        vboxLayout->addWidget(downButton);
+
+        spacerItem = new QSpacerItem(29, 16, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(spacerItem);
+
+
+        gridLayout->addLayout(vboxLayout, 3, 1, 1, 1);
+
+        currentToolBarList = new QListWidget(QtToolBarDialog);
+        currentToolBarList->setObjectName(QString::fromUtf8("currentToolBarList"));
+
+        gridLayout->addWidget(currentToolBarList, 3, 2, 1, 1);
+
+        label_3 = new QLabel(QtToolBarDialog);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout->addWidget(label_3, 2, 1, 1, 2);
+
+        toolBarList = new QListWidget(QtToolBarDialog);
+        toolBarList->setObjectName(QString::fromUtf8("toolBarList"));
+
+        gridLayout->addWidget(toolBarList, 1, 1, 1, 2);
+
+        buttonBox = new QDialogButtonBox(QtToolBarDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setStandardButtons(QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults);
+
+        gridLayout->addWidget(buttonBox, 5, 0, 1, 3);
+
+        QWidget::setTabOrder(newButton, removeButton);
+        QWidget::setTabOrder(removeButton, renameButton);
+        QWidget::setTabOrder(renameButton, toolBarList);
+        QWidget::setTabOrder(toolBarList, upButton);
+        QWidget::setTabOrder(upButton, leftButton);
+        QWidget::setTabOrder(leftButton, rightButton);
+        QWidget::setTabOrder(rightButton, downButton);
+        QWidget::setTabOrder(downButton, currentToolBarList);
+
+        retranslateUi(QtToolBarDialog);
+
+        QMetaObject::connectSlotsByName(QtToolBarDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *QtToolBarDialog)
+    {
+        QtToolBarDialog->setWindowTitle(QApplication::translate("QtToolBarDialog", "Customize Toolbars", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = actionTree->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("QtToolBarDialog", "1", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("QtToolBarDialog", "Actions", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("QtToolBarDialog", "Toolbars", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        newButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add new toolbar", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newButton->setText(QApplication::translate("QtToolBarDialog", "New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        removeButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove selected toolbar", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        removeButton->setText(QApplication::translate("QtToolBarDialog", "Remove", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        renameButton->setToolTip(QApplication::translate("QtToolBarDialog", "Rename toolbar", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        renameButton->setText(QApplication::translate("QtToolBarDialog", "Rename", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        upButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        upButton->setText(QApplication::translate("QtToolBarDialog", "Up", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        leftButton->setToolTip(QApplication::translate("QtToolBarDialog", "Remove action from toolbar", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        leftButton->setText(QApplication::translate("QtToolBarDialog", "<-", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        rightButton->setToolTip(QApplication::translate("QtToolBarDialog", "Add action to toolbar", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        rightButton->setText(QApplication::translate("QtToolBarDialog", "->", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        downButton->setToolTip(QApplication::translate("QtToolBarDialog", "Move action down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        downButton->setText(QApplication::translate("QtToolBarDialog", "Down", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("QtToolBarDialog", "Current Toolbar Actions", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QtToolBarDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QtToolBarDialog: public Ui_QtToolBarDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QTTOOLBARDIALOG_H
diff --git a/tests/auto/uic/baseline/querywidget.ui b/tests/auto/uic/baseline/querywidget.ui
new file mode 100644
index 0000000..53fa622
--- /dev/null
+++ b/tests/auto/uic/baseline/querywidget.ui
@@ -0,0 +1,163 @@
+<ui version="4.0" >
+ <class>QueryWidget</class>
+ <widget class="QMainWindow" name="QueryWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>545</width>
+    <height>531</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Recipes XQuery Example</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>29</y>
+     <width>545</width>
+     <height>480</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout" >
+    <item>
+     <layout class="QVBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QGroupBox" name="inputGroupBox" >
+        <property name="minimumSize" >
+         <size>
+          <width>550</width>
+          <height>120</height>
+         </size>
+        </property>
+        <property name="title" >
+         <string>Input Document</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4" >
+         <item>
+          <layout class="QVBoxLayout" name="_2" >
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QTextEdit" name="inputTextEdit" />
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="queryGroupBox" >
+        <property name="minimumSize" >
+         <size>
+          <width>550</width>
+          <height>120</height>
+         </size>
+        </property>
+        <property name="title" >
+         <string>Select your query:</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_5" >
+         <item>
+          <widget class="QComboBox" name="defaultQueries" />
+         </item>
+         <item>
+          <widget class="QTextEdit" name="queryTextEdit" >
+           <property name="minimumSize" >
+            <size>
+             <width>400</width>
+             <height>60</height>
+            </size>
+           </property>
+           <property name="readOnly" >
+            <bool>true</bool>
+           </property>
+           <property name="acceptRichText" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="outputGroupBox" >
+        <property name="minimumSize" >
+         <size>
+          <width>550</width>
+          <height>120</height>
+         </size>
+        </property>
+        <property name="title" >
+         <string>Output Document</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_6" >
+         <item>
+          <layout class="QVBoxLayout" name="_3" >
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QTextEdit" name="outputTextEdit" >
+             <property name="minimumSize" >
+              <size>
+               <width>500</width>
+               <height>80</height>
+              </size>
+             </property>
+             <property name="readOnly" >
+              <bool>true</bool>
+             </property>
+             <property name="acceptRichText" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>545</width>
+     <height>29</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>509</y>
+     <width>545</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/querywidget.ui.h b/tests/auto/uic/baseline/querywidget.ui.h
new file mode 100644
index 0000000..e49c197
--- /dev/null
+++ b/tests/auto/uic/baseline/querywidget.ui.h
@@ -0,0 +1,175 @@
+/********************************************************************************
+** Form generated from reading ui file 'querywidget.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef QUERYWIDGET_H
+#define QUERYWIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenuBar>
+#include <QtGui/QStatusBar>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_QueryWidget
+{
+public:
+    QWidget *centralwidget;
+    QVBoxLayout *verticalLayout;
+    QVBoxLayout *vboxLayout;
+    QGroupBox *inputGroupBox;
+    QVBoxLayout *verticalLayout_4;
+    QVBoxLayout *_2;
+    QTextEdit *inputTextEdit;
+    QGroupBox *queryGroupBox;
+    QVBoxLayout *verticalLayout_5;
+    QComboBox *defaultQueries;
+    QTextEdit *queryTextEdit;
+    QGroupBox *outputGroupBox;
+    QVBoxLayout *verticalLayout_6;
+    QVBoxLayout *_3;
+    QTextEdit *outputTextEdit;
+    QMenuBar *menubar;
+    QStatusBar *statusbar;
+
+    void setupUi(QMainWindow *QueryWidget)
+    {
+        if (QueryWidget->objectName().isEmpty())
+            QueryWidget->setObjectName(QString::fromUtf8("QueryWidget"));
+        QueryWidget->resize(545, 531);
+        centralwidget = new QWidget(QueryWidget);
+        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
+        centralwidget->setGeometry(QRect(0, 29, 545, 480));
+        verticalLayout = new QVBoxLayout(centralwidget);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        vboxLayout = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(0);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        inputGroupBox = new QGroupBox(centralwidget);
+        inputGroupBox->setObjectName(QString::fromUtf8("inputGroupBox"));
+        inputGroupBox->setMinimumSize(QSize(550, 120));
+        verticalLayout_4 = new QVBoxLayout(inputGroupBox);
+        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
+        _2 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        _2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        _2->setMargin(0);
+#endif
+        _2->setObjectName(QString::fromUtf8("_2"));
+        inputTextEdit = new QTextEdit(inputGroupBox);
+        inputTextEdit->setObjectName(QString::fromUtf8("inputTextEdit"));
+
+        _2->addWidget(inputTextEdit);
+
+
+        verticalLayout_4->addLayout(_2);
+
+
+        vboxLayout->addWidget(inputGroupBox);
+
+        queryGroupBox = new QGroupBox(centralwidget);
+        queryGroupBox->setObjectName(QString::fromUtf8("queryGroupBox"));
+        queryGroupBox->setMinimumSize(QSize(550, 120));
+        verticalLayout_5 = new QVBoxLayout(queryGroupBox);
+        verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5"));
+        defaultQueries = new QComboBox(queryGroupBox);
+        defaultQueries->setObjectName(QString::fromUtf8("defaultQueries"));
+
+        verticalLayout_5->addWidget(defaultQueries);
+
+        queryTextEdit = new QTextEdit(queryGroupBox);
+        queryTextEdit->setObjectName(QString::fromUtf8("queryTextEdit"));
+        queryTextEdit->setMinimumSize(QSize(400, 60));
+        queryTextEdit->setReadOnly(true);
+        queryTextEdit->setAcceptRichText(false);
+
+        verticalLayout_5->addWidget(queryTextEdit);
+
+
+        vboxLayout->addWidget(queryGroupBox);
+
+        outputGroupBox = new QGroupBox(centralwidget);
+        outputGroupBox->setObjectName(QString::fromUtf8("outputGroupBox"));
+        outputGroupBox->setMinimumSize(QSize(550, 120));
+        verticalLayout_6 = new QVBoxLayout(outputGroupBox);
+        verticalLayout_6->setObjectName(QString::fromUtf8("verticalLayout_6"));
+        _3 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        _3->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        _3->setMargin(0);
+#endif
+        _3->setObjectName(QString::fromUtf8("_3"));
+        outputTextEdit = new QTextEdit(outputGroupBox);
+        outputTextEdit->setObjectName(QString::fromUtf8("outputTextEdit"));
+        outputTextEdit->setMinimumSize(QSize(500, 80));
+        outputTextEdit->setReadOnly(true);
+        outputTextEdit->setAcceptRichText(false);
+
+        _3->addWidget(outputTextEdit);
+
+
+        verticalLayout_6->addLayout(_3);
+
+
+        vboxLayout->addWidget(outputGroupBox);
+
+
+        verticalLayout->addLayout(vboxLayout);
+
+        QueryWidget->setCentralWidget(centralwidget);
+        menubar = new QMenuBar(QueryWidget);
+        menubar->setObjectName(QString::fromUtf8("menubar"));
+        menubar->setGeometry(QRect(0, 0, 545, 29));
+        QueryWidget->setMenuBar(menubar);
+        statusbar = new QStatusBar(QueryWidget);
+        statusbar->setObjectName(QString::fromUtf8("statusbar"));
+        statusbar->setGeometry(QRect(0, 509, 545, 22));
+        QueryWidget->setStatusBar(statusbar);
+
+        retranslateUi(QueryWidget);
+
+        QMetaObject::connectSlotsByName(QueryWidget);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *QueryWidget)
+    {
+        QueryWidget->setWindowTitle(QApplication::translate("QueryWidget", "Recipes XQuery Example", 0, QApplication::UnicodeUTF8));
+        inputGroupBox->setTitle(QApplication::translate("QueryWidget", "Input Document", 0, QApplication::UnicodeUTF8));
+        queryGroupBox->setTitle(QApplication::translate("QueryWidget", "Select your query:", 0, QApplication::UnicodeUTF8));
+        outputGroupBox->setTitle(QApplication::translate("QueryWidget", "Output Document", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(QueryWidget);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class QueryWidget: public Ui_QueryWidget {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // QUERYWIDGET_H
diff --git a/tests/auto/uic/baseline/remotecontrol.ui b/tests/auto/uic/baseline/remotecontrol.ui
new file mode 100644
index 0000000..1cfc7f5
--- /dev/null
+++ b/tests/auto/uic/baseline/remotecontrol.ui
@@ -0,0 +1,228 @@
+<ui version="4.0" >
+ <class>RemoteControlClass</class>
+ <widget class="QMainWindow" name="RemoteControlClass" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>344</width>
+    <height>364</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>RemoteControl</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" >
+   <layout class="QGridLayout" >
+    <item row="0" column="0" >
+     <widget class="QLabel" name="label" >
+      <property name="text" >
+       <string>Start URL:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1" colspan="2" >
+     <widget class="QLineEdit" name="startUrlLineEdit" />
+    </item>
+    <item row="1" column="1" >
+     <widget class="QPushButton" name="launchButton" >
+      <property name="text" >
+       <string>Launch Qt HelpViewer</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2" >
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>101</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="2" column="1" >
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeType" >
+       <enum>QSizePolicy::Fixed</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>113</width>
+        <height>16</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="3" column="0" colspan="3" >
+     <widget class="QGroupBox" name="actionGroupBox" >
+      <property name="enabled" >
+       <bool>false</bool>
+      </property>
+      <property name="title" >
+       <string>Actions</string>
+      </property>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Search in Index:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="indexLineEdit" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="indexButton" >
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="remotecontrol.qrc" >:/remotecontrol/enter.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_4" >
+         <property name="text" >
+          <string>Identifier:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="identifierLineEdit" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="identifierButton" >
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="remotecontrol.qrc" >:/remotecontrol/enter.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_3" >
+         <property name="text" >
+          <string>Show URL:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="urlLineEdit" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="urlButton" >
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="remotecontrol.qrc" >:/remotecontrol/enter.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="1" >
+        <widget class="QPushButton" name="syncContentsButton" >
+         <property name="text" >
+          <string>Sync Contents</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>81</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="4" column="0" colspan="3" >
+        <widget class="QCheckBox" name="contentsCheckBox" >
+         <property name="text" >
+          <string>Show Contents</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" >
+        <widget class="QCheckBox" name="indexCheckBox" >
+         <property name="text" >
+          <string>Show Index</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="3" >
+        <widget class="QCheckBox" name="bookmarksCheckBox" >
+         <property name="text" >
+          <string>Show Bookmarks</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>344</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <addaction name="actionQuit" />
+   </widget>
+   <addaction name="menuFile" />
+  </widget>
+  <widget class="QStatusBar" name="statusBar" />
+  <action name="actionQuit" >
+   <property name="text" >
+    <string>Quit</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <resources>
+  <include location="remotecontrol.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/remotecontrol.ui.h b/tests/auto/uic/baseline/remotecontrol.ui.h
new file mode 100644
index 0000000..b8acf9d
--- /dev/null
+++ b/tests/auto/uic/baseline/remotecontrol.ui.h
@@ -0,0 +1,253 @@
+/********************************************************************************
+** Form generated from reading ui file 'remotecontrol.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef REMOTECONTROL_H
+#define REMOTECONTROL_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QStatusBar>
+#include <QtGui/QToolButton>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_RemoteControlClass
+{
+public:
+    QAction *actionQuit;
+    QWidget *centralWidget;
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QLineEdit *startUrlLineEdit;
+    QPushButton *launchButton;
+    QSpacerItem *spacerItem;
+    QSpacerItem *spacerItem1;
+    QGroupBox *actionGroupBox;
+    QGridLayout *gridLayout1;
+    QLabel *label_2;
+    QHBoxLayout *hboxLayout;
+    QLineEdit *indexLineEdit;
+    QToolButton *indexButton;
+    QLabel *label_4;
+    QHBoxLayout *hboxLayout1;
+    QLineEdit *identifierLineEdit;
+    QToolButton *identifierButton;
+    QLabel *label_3;
+    QHBoxLayout *hboxLayout2;
+    QLineEdit *urlLineEdit;
+    QToolButton *urlButton;
+    QPushButton *syncContentsButton;
+    QSpacerItem *spacerItem2;
+    QCheckBox *contentsCheckBox;
+    QCheckBox *indexCheckBox;
+    QCheckBox *bookmarksCheckBox;
+    QMenuBar *menuBar;
+    QMenu *menuFile;
+    QStatusBar *statusBar;
+
+    void setupUi(QMainWindow *RemoteControlClass)
+    {
+        if (RemoteControlClass->objectName().isEmpty())
+            RemoteControlClass->setObjectName(QString::fromUtf8("RemoteControlClass"));
+        RemoteControlClass->resize(344, 364);
+        actionQuit = new QAction(RemoteControlClass);
+        actionQuit->setObjectName(QString::fromUtf8("actionQuit"));
+        centralWidget = new QWidget(RemoteControlClass);
+        centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
+        gridLayout = new QGridLayout(centralWidget);
+        gridLayout->setSpacing(6);
+        gridLayout->setMargin(11);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(centralWidget);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        startUrlLineEdit = new QLineEdit(centralWidget);
+        startUrlLineEdit->setObjectName(QString::fromUtf8("startUrlLineEdit"));
+
+        gridLayout->addWidget(startUrlLineEdit, 0, 1, 1, 2);
+
+        launchButton = new QPushButton(centralWidget);
+        launchButton->setObjectName(QString::fromUtf8("launchButton"));
+
+        gridLayout->addWidget(launchButton, 1, 1, 1, 1);
+
+        spacerItem = new QSpacerItem(101, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 1, 2, 1, 1);
+
+        spacerItem1 = new QSpacerItem(113, 16, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem1, 2, 1, 1, 1);
+
+        actionGroupBox = new QGroupBox(centralWidget);
+        actionGroupBox->setObjectName(QString::fromUtf8("actionGroupBox"));
+        actionGroupBox->setEnabled(false);
+        gridLayout1 = new QGridLayout(actionGroupBox);
+        gridLayout1->setSpacing(6);
+        gridLayout1->setMargin(11);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        label_2 = new QLabel(actionGroupBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout1->addWidget(label_2, 0, 0, 1, 1);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setSpacing(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        indexLineEdit = new QLineEdit(actionGroupBox);
+        indexLineEdit->setObjectName(QString::fromUtf8("indexLineEdit"));
+
+        hboxLayout->addWidget(indexLineEdit);
+
+        indexButton = new QToolButton(actionGroupBox);
+        indexButton->setObjectName(QString::fromUtf8("indexButton"));
+        const QIcon icon = QIcon(QString::fromUtf8(":/remotecontrol/enter.png"));
+        indexButton->setIcon(icon);
+
+        hboxLayout->addWidget(indexButton);
+
+
+        gridLayout1->addLayout(hboxLayout, 0, 1, 1, 2);
+
+        label_4 = new QLabel(actionGroupBox);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        gridLayout1->addWidget(label_4, 1, 0, 1, 1);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setSpacing(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        identifierLineEdit = new QLineEdit(actionGroupBox);
+        identifierLineEdit->setObjectName(QString::fromUtf8("identifierLineEdit"));
+
+        hboxLayout1->addWidget(identifierLineEdit);
+
+        identifierButton = new QToolButton(actionGroupBox);
+        identifierButton->setObjectName(QString::fromUtf8("identifierButton"));
+        identifierButton->setIcon(icon);
+
+        hboxLayout1->addWidget(identifierButton);
+
+
+        gridLayout1->addLayout(hboxLayout1, 1, 1, 1, 2);
+
+        label_3 = new QLabel(actionGroupBox);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout1->addWidget(label_3, 2, 0, 1, 1);
+
+        hboxLayout2 = new QHBoxLayout();
+        hboxLayout2->setSpacing(0);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        urlLineEdit = new QLineEdit(actionGroupBox);
+        urlLineEdit->setObjectName(QString::fromUtf8("urlLineEdit"));
+
+        hboxLayout2->addWidget(urlLineEdit);
+
+        urlButton = new QToolButton(actionGroupBox);
+        urlButton->setObjectName(QString::fromUtf8("urlButton"));
+        urlButton->setIcon(icon);
+
+        hboxLayout2->addWidget(urlButton);
+
+
+        gridLayout1->addLayout(hboxLayout2, 2, 1, 1, 2);
+
+        syncContentsButton = new QPushButton(actionGroupBox);
+        syncContentsButton->setObjectName(QString::fromUtf8("syncContentsButton"));
+
+        gridLayout1->addWidget(syncContentsButton, 3, 1, 1, 1);
+
+        spacerItem2 = new QSpacerItem(81, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout1->addItem(spacerItem2, 3, 2, 1, 1);
+
+        contentsCheckBox = new QCheckBox(actionGroupBox);
+        contentsCheckBox->setObjectName(QString::fromUtf8("contentsCheckBox"));
+
+        gridLayout1->addWidget(contentsCheckBox, 4, 0, 1, 3);
+
+        indexCheckBox = new QCheckBox(actionGroupBox);
+        indexCheckBox->setObjectName(QString::fromUtf8("indexCheckBox"));
+
+        gridLayout1->addWidget(indexCheckBox, 5, 0, 1, 1);
+
+        bookmarksCheckBox = new QCheckBox(actionGroupBox);
+        bookmarksCheckBox->setObjectName(QString::fromUtf8("bookmarksCheckBox"));
+
+        gridLayout1->addWidget(bookmarksCheckBox, 6, 0, 1, 3);
+
+
+        gridLayout->addWidget(actionGroupBox, 3, 0, 1, 3);
+
+        RemoteControlClass->setCentralWidget(centralWidget);
+        menuBar = new QMenuBar(RemoteControlClass);
+        menuBar->setObjectName(QString::fromUtf8("menuBar"));
+        menuBar->setGeometry(QRect(0, 0, 344, 21));
+        menuFile = new QMenu(menuBar);
+        menuFile->setObjectName(QString::fromUtf8("menuFile"));
+        RemoteControlClass->setMenuBar(menuBar);
+        statusBar = new QStatusBar(RemoteControlClass);
+        statusBar->setObjectName(QString::fromUtf8("statusBar"));
+        RemoteControlClass->setStatusBar(statusBar);
+
+        menuBar->addAction(menuFile->menuAction());
+        menuFile->addAction(actionQuit);
+
+        retranslateUi(RemoteControlClass);
+
+        QMetaObject::connectSlotsByName(RemoteControlClass);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *RemoteControlClass)
+    {
+        RemoteControlClass->setWindowTitle(QApplication::translate("RemoteControlClass", "RemoteControl", 0, QApplication::UnicodeUTF8));
+        actionQuit->setText(QApplication::translate("RemoteControlClass", "Quit", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("RemoteControlClass", "Start URL:", 0, QApplication::UnicodeUTF8));
+        launchButton->setText(QApplication::translate("RemoteControlClass", "Launch Qt HelpViewer", 0, QApplication::UnicodeUTF8));
+        actionGroupBox->setTitle(QApplication::translate("RemoteControlClass", "Actions", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("RemoteControlClass", "Search in Index:", 0, QApplication::UnicodeUTF8));
+        indexButton->setText(QString());
+        label_4->setText(QApplication::translate("RemoteControlClass", "Identifier:", 0, QApplication::UnicodeUTF8));
+        identifierButton->setText(QString());
+        label_3->setText(QApplication::translate("RemoteControlClass", "Show URL:", 0, QApplication::UnicodeUTF8));
+        urlButton->setText(QString());
+        syncContentsButton->setText(QApplication::translate("RemoteControlClass", "Sync Contents", 0, QApplication::UnicodeUTF8));
+        contentsCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Contents", 0, QApplication::UnicodeUTF8));
+        indexCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Index", 0, QApplication::UnicodeUTF8));
+        bookmarksCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Bookmarks", 0, QApplication::UnicodeUTF8));
+        menuFile->setTitle(QApplication::translate("RemoteControlClass", "File", 0, QApplication::UnicodeUTF8));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class RemoteControlClass: public Ui_RemoteControlClass {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // REMOTECONTROL_H
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui b/tests/auto/uic/baseline/saveformastemplate.ui
new file mode 100644
index 0000000..c9e0603
--- /dev/null
+++ b/tests/auto/uic/baseline/saveformastemplate.ui
@@ -0,0 +1,165 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>SaveFormAsTemplate</class>
+ <widget class="QDialog" name="SaveFormAsTemplate" >
+  <property name="windowTitle" >
+   <string>Save Form As Template</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QFormLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>&amp;Name:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+       <property name="buddy" >
+        <cstring>templateNameEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="templateNameEdit" >
+       <property name="minimumSize" >
+        <size>
+         <width>222</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="echoMode" >
+        <enum>QLineEdit::Normal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>&amp;Category:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+       <property name="buddy" >
+        <cstring>categoryCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QComboBox" name="categoryCombo" />
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QFrame" name="horizontalLine" >
+     <property name="frameShape" >
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Sunken</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SaveFormAsTemplate</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>256</x>
+     <y>124</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>113</x>
+     <y>143</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SaveFormAsTemplate</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>332</x>
+     <y>127</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>372</x>
+     <y>147</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui.h b/tests/auto/uic/baseline/saveformastemplate.ui.h
new file mode 100644
index 0000000..1bad01e
--- /dev/null
+++ b/tests/auto/uic/baseline/saveformastemplate.ui.h
@@ -0,0 +1,165 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'saveformastemplate.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef SAVEFORMASTEMPLATE_H
+#define SAVEFORMASTEMPLATE_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QFrame>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_SaveFormAsTemplate
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QFormLayout *formLayout;
+    QLabel *label;
+    QLineEdit *templateNameEdit;
+    QLabel *label_2;
+    QComboBox *categoryCombo;
+    QFrame *horizontalLine;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *SaveFormAsTemplate)
+    {
+        if (SaveFormAsTemplate->objectName().isEmpty())
+            SaveFormAsTemplate->setObjectName(QString::fromUtf8("SaveFormAsTemplate"));
+        vboxLayout = new QVBoxLayout(SaveFormAsTemplate);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        formLayout = new QFormLayout();
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
+        label = new QLabel(SaveFormAsTemplate);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setFrameShape(QFrame::NoFrame);
+        label->setFrameShadow(QFrame::Plain);
+        label->setTextFormat(Qt::AutoText);
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+
+        templateNameEdit = new QLineEdit(SaveFormAsTemplate);
+        templateNameEdit->setObjectName(QString::fromUtf8("templateNameEdit"));
+        templateNameEdit->setMinimumSize(QSize(222, 0));
+        templateNameEdit->setEchoMode(QLineEdit::Normal);
+
+        formLayout->setWidget(0, QFormLayout::FieldRole, templateNameEdit);
+
+        label_2 = new QLabel(SaveFormAsTemplate);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        label_2->setFrameShape(QFrame::NoFrame);
+        label_2->setFrameShadow(QFrame::Plain);
+        label_2->setTextFormat(Qt::AutoText);
+
+        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+
+        categoryCombo = new QComboBox(SaveFormAsTemplate);
+        categoryCombo->setObjectName(QString::fromUtf8("categoryCombo"));
+
+        formLayout->setWidget(1, QFormLayout::FieldRole, categoryCombo);
+
+
+        vboxLayout->addLayout(formLayout);
+
+        horizontalLine = new QFrame(SaveFormAsTemplate);
+        horizontalLine->setObjectName(QString::fromUtf8("horizontalLine"));
+        horizontalLine->setFrameShape(QFrame::HLine);
+        horizontalLine->setFrameShadow(QFrame::Sunken);
+
+        vboxLayout->addWidget(horizontalLine);
+
+        buttonBox = new QDialogButtonBox(SaveFormAsTemplate);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(templateNameEdit);
+        label_2->setBuddy(categoryCombo);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(SaveFormAsTemplate);
+        QObject::connect(buttonBox, SIGNAL(accepted()), SaveFormAsTemplate, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), SaveFormAsTemplate, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(SaveFormAsTemplate);
+    } // setupUi
+
+    void retranslateUi(QDialog *SaveFormAsTemplate)
+    {
+        SaveFormAsTemplate->setWindowTitle(QApplication::translate("SaveFormAsTemplate", "Save Form As Template", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("SaveFormAsTemplate", "&Name:", 0, QApplication::UnicodeUTF8));
+        templateNameEdit->setText(QString());
+        label_2->setText(QApplication::translate("SaveFormAsTemplate", "&Category:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(SaveFormAsTemplate);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class SaveFormAsTemplate: public Ui_SaveFormAsTemplate {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // SAVEFORMASTEMPLATE_H
diff --git a/tests/auto/uic/baseline/settings.ui b/tests/auto/uic/baseline/settings.ui
new file mode 100644
index 0000000..fcf698b
--- /dev/null
+++ b/tests/auto/uic/baseline/settings.ui
@@ -0,0 +1,262 @@
+<ui version="4.0" >
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>392</width>
+    <height>176</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>90</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string>Audio device:</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="deviceCombo" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="label_6" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>90</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string>Audio effect:</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="audioEffectsCombo" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="crossFadeLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>90</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string>Cross fade:</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QSlider" name="crossFadeSlider" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimum" >
+          <number>-20</number>
+         </property>
+         <property name="maximum" >
+          <number>20</number>
+         </property>
+         <property name="singleStep" >
+          <number>1</number>
+         </property>
+         <property name="pageStep" >
+          <number>2</number>
+         </property>
+         <property name="value" >
+          <number>0</number>
+         </property>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="tickPosition" >
+          <enum>QSlider::TicksBelow</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLabel" name="label_3" >
+           <property name="font" >
+            <font>
+             <pointsize>9</pointsize>
+            </font>
+           </property>
+           <property name="text" >
+            <string>-10 Sec</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_5" >
+           <property name="font" >
+            <font>
+             <pointsize>9</pointsize>
+            </font>
+           </property>
+           <property name="text" >
+            <string>0</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_4" >
+           <property name="font" >
+            <font>
+             <pointsize>9</pointsize>
+            </font>
+           </property>
+           <property name="text" >
+            <string>10 Sec</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/settings.ui.h b/tests/auto/uic/baseline/settings.ui.h
new file mode 100644
index 0000000..8fb0ef2
--- /dev/null
+++ b/tests/auto/uic/baseline/settings.ui.h
@@ -0,0 +1,207 @@
+/********************************************************************************
+** Form generated from reading ui file 'settings.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QSlider>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Dialog
+{
+public:
+    QVBoxLayout *verticalLayout;
+    QHBoxLayout *hboxLayout;
+    QLabel *label;
+    QComboBox *deviceCombo;
+    QHBoxLayout *hboxLayout1;
+    QLabel *label_6;
+    QComboBox *audioEffectsCombo;
+    QHBoxLayout *hboxLayout2;
+    QLabel *crossFadeLabel;
+    QVBoxLayout *vboxLayout;
+    QSlider *crossFadeSlider;
+    QHBoxLayout *hboxLayout3;
+    QLabel *label_3;
+    QSpacerItem *spacerItem;
+    QLabel *label_5;
+    QSpacerItem *spacerItem1;
+    QLabel *label_4;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *Dialog)
+    {
+        if (Dialog->objectName().isEmpty())
+            Dialog->setObjectName(QString::fromUtf8("Dialog"));
+        Dialog->resize(392, 176);
+        verticalLayout = new QVBoxLayout(Dialog);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        label = new QLabel(Dialog);
+        label->setObjectName(QString::fromUtf8("label"));
+        QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy);
+        label->setMinimumSize(QSize(90, 0));
+        label->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
+
+        hboxLayout->addWidget(label);
+
+        deviceCombo = new QComboBox(Dialog);
+        deviceCombo->setObjectName(QString::fromUtf8("deviceCombo"));
+        QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(deviceCombo->sizePolicy().hasHeightForWidth());
+        deviceCombo->setSizePolicy(sizePolicy1);
+
+        hboxLayout->addWidget(deviceCombo);
+
+
+        verticalLayout->addLayout(hboxLayout);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        label_6 = new QLabel(Dialog);
+        label_6->setObjectName(QString::fromUtf8("label_6"));
+        sizePolicy.setHeightForWidth(label_6->sizePolicy().hasHeightForWidth());
+        label_6->setSizePolicy(sizePolicy);
+        label_6->setMinimumSize(QSize(90, 0));
+        label_6->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
+
+        hboxLayout1->addWidget(label_6);
+
+        audioEffectsCombo = new QComboBox(Dialog);
+        audioEffectsCombo->setObjectName(QString::fromUtf8("audioEffectsCombo"));
+        sizePolicy1.setHeightForWidth(audioEffectsCombo->sizePolicy().hasHeightForWidth());
+        audioEffectsCombo->setSizePolicy(sizePolicy1);
+
+        hboxLayout1->addWidget(audioEffectsCombo);
+
+
+        verticalLayout->addLayout(hboxLayout1);
+
+        hboxLayout2 = new QHBoxLayout();
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        crossFadeLabel = new QLabel(Dialog);
+        crossFadeLabel->setObjectName(QString::fromUtf8("crossFadeLabel"));
+        sizePolicy.setHeightForWidth(crossFadeLabel->sizePolicy().hasHeightForWidth());
+        crossFadeLabel->setSizePolicy(sizePolicy);
+        crossFadeLabel->setMinimumSize(QSize(90, 0));
+        crossFadeLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
+
+        hboxLayout2->addWidget(crossFadeLabel);
+
+        vboxLayout = new QVBoxLayout();
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        crossFadeSlider = new QSlider(Dialog);
+        crossFadeSlider->setObjectName(QString::fromUtf8("crossFadeSlider"));
+        sizePolicy1.setHeightForWidth(crossFadeSlider->sizePolicy().hasHeightForWidth());
+        crossFadeSlider->setSizePolicy(sizePolicy1);
+        crossFadeSlider->setMinimum(-20);
+        crossFadeSlider->setMaximum(20);
+        crossFadeSlider->setSingleStep(1);
+        crossFadeSlider->setPageStep(2);
+        crossFadeSlider->setValue(0);
+        crossFadeSlider->setOrientation(Qt::Horizontal);
+        crossFadeSlider->setTickPosition(QSlider::TicksBelow);
+
+        vboxLayout->addWidget(crossFadeSlider);
+
+        hboxLayout3 = new QHBoxLayout();
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        label_3 = new QLabel(Dialog);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+        QFont font;
+        font.setPointSize(9);
+        label_3->setFont(font);
+
+        hboxLayout3->addWidget(label_3);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout3->addItem(spacerItem);
+
+        label_5 = new QLabel(Dialog);
+        label_5->setObjectName(QString::fromUtf8("label_5"));
+        label_5->setFont(font);
+
+        hboxLayout3->addWidget(label_5);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout3->addItem(spacerItem1);
+
+        label_4 = new QLabel(Dialog);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+        label_4->setFont(font);
+
+        hboxLayout3->addWidget(label_4);
+
+
+        vboxLayout->addLayout(hboxLayout3);
+
+
+        hboxLayout2->addLayout(vboxLayout);
+
+
+        verticalLayout->addLayout(hboxLayout2);
+
+        buttonBox = new QDialogButtonBox(Dialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        verticalLayout->addWidget(buttonBox);
+
+
+        retranslateUi(Dialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(Dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *Dialog)
+    {
+        Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("Dialog", "Audio device:", 0, QApplication::UnicodeUTF8));
+        label_6->setText(QApplication::translate("Dialog", "Audio effect:", 0, QApplication::UnicodeUTF8));
+        crossFadeLabel->setText(QApplication::translate("Dialog", "Cross fade:", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("Dialog", "-10 Sec", 0, QApplication::UnicodeUTF8));
+        label_5->setText(QApplication::translate("Dialog", "0", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("Dialog", "10 Sec", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Dialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Dialog: public Ui_Dialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // SETTINGS_H
diff --git a/tests/auto/uic/baseline/signalslotdialog.ui b/tests/auto/uic/baseline/signalslotdialog.ui
new file mode 100644
index 0000000..1a8a8d9
--- /dev/null
+++ b/tests/auto/uic/baseline/signalslotdialog.ui
@@ -0,0 +1,129 @@
+<ui version="4.0" >
+ <class>SignalSlotDialogClass</class>
+ <widget class="QDialog" name="SignalSlotDialogClass" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>617</width>
+    <height>535</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Signals and slots</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="slotGroupBox" >
+     <property name="title" >
+      <string>Slots</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QListView" name="slotListView" />
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QToolButton" name="addSlotButton" >
+          <property name="toolTip" >
+           <string>Add</string>
+          </property>
+          <property name="text" >
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="removeSlotButton" >
+          <property name="toolTip" >
+           <string>Delete</string>
+          </property>
+          <property name="text" >
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="signalGroupBox" >
+     <property name="title" >
+      <string>Signals</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QListView" name="signalListView" />
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QToolButton" name="addSignalButton" >
+          <property name="toolTip" >
+           <string>Add</string>
+          </property>
+          <property name="text" >
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="removeSignalButton" >
+          <property name="toolTip" >
+           <string>Delete</string>
+          </property>
+          <property name="text" >
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="spacerName" stdset="0" >
+           <string/>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/signalslotdialog.ui.h b/tests/auto/uic/baseline/signalslotdialog.ui.h
new file mode 100644
index 0000000..393532a
--- /dev/null
+++ b/tests/auto/uic/baseline/signalslotdialog.ui.h
@@ -0,0 +1,170 @@
+/********************************************************************************
+** Form generated from reading ui file 'signalslotdialog.ui'
+**
+** Created: Mon Jun 16 16:18:52 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef SIGNALSLOTDIALOG_H
+#define SIGNALSLOTDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListView>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_SignalSlotDialogClass
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *slotGroupBox;
+    QVBoxLayout *vboxLayout1;
+    QListView *slotListView;
+    QHBoxLayout *hboxLayout;
+    QToolButton *addSlotButton;
+    QToolButton *removeSlotButton;
+    QSpacerItem *spacerItem;
+    QGroupBox *signalGroupBox;
+    QVBoxLayout *vboxLayout2;
+    QListView *signalListView;
+    QHBoxLayout *hboxLayout1;
+    QToolButton *addSignalButton;
+    QToolButton *removeSignalButton;
+    QSpacerItem *spacerItem1;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *SignalSlotDialogClass)
+    {
+        if (SignalSlotDialogClass->objectName().isEmpty())
+            SignalSlotDialogClass->setObjectName(QString::fromUtf8("SignalSlotDialogClass"));
+        SignalSlotDialogClass->resize(617, 535);
+        vboxLayout = new QVBoxLayout(SignalSlotDialogClass);
+        vboxLayout->setSpacing(6);
+        vboxLayout->setMargin(11);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        slotGroupBox = new QGroupBox(SignalSlotDialogClass);
+        slotGroupBox->setObjectName(QString::fromUtf8("slotGroupBox"));
+        vboxLayout1 = new QVBoxLayout(slotGroupBox);
+        vboxLayout1->setSpacing(6);
+        vboxLayout1->setMargin(11);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        slotListView = new QListView(slotGroupBox);
+        slotListView->setObjectName(QString::fromUtf8("slotListView"));
+
+        vboxLayout1->addWidget(slotListView);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setSpacing(6);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        addSlotButton = new QToolButton(slotGroupBox);
+        addSlotButton->setObjectName(QString::fromUtf8("addSlotButton"));
+
+        hboxLayout->addWidget(addSlotButton);
+
+        removeSlotButton = new QToolButton(slotGroupBox);
+        removeSlotButton->setObjectName(QString::fromUtf8("removeSlotButton"));
+
+        hboxLayout->addWidget(removeSlotButton);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout1->addLayout(hboxLayout);
+
+
+        vboxLayout->addWidget(slotGroupBox);
+
+        signalGroupBox = new QGroupBox(SignalSlotDialogClass);
+        signalGroupBox->setObjectName(QString::fromUtf8("signalGroupBox"));
+        vboxLayout2 = new QVBoxLayout(signalGroupBox);
+        vboxLayout2->setSpacing(6);
+        vboxLayout2->setMargin(11);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        signalListView = new QListView(signalGroupBox);
+        signalListView->setObjectName(QString::fromUtf8("signalListView"));
+
+        vboxLayout2->addWidget(signalListView);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setSpacing(6);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        addSignalButton = new QToolButton(signalGroupBox);
+        addSignalButton->setObjectName(QString::fromUtf8("addSignalButton"));
+
+        hboxLayout1->addWidget(addSignalButton);
+
+        removeSignalButton = new QToolButton(signalGroupBox);
+        removeSignalButton->setObjectName(QString::fromUtf8("removeSignalButton"));
+
+        hboxLayout1->addWidget(removeSignalButton);
+
+        spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem1);
+
+
+        vboxLayout2->addLayout(hboxLayout1);
+
+
+        vboxLayout->addWidget(signalGroupBox);
+
+        buttonBox = new QDialogButtonBox(SignalSlotDialogClass);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(SignalSlotDialogClass);
+
+        QMetaObject::connectSlotsByName(SignalSlotDialogClass);
+    } // setupUi
+
+    void retranslateUi(QDialog *SignalSlotDialogClass)
+    {
+        SignalSlotDialogClass->setWindowTitle(QApplication::translate("SignalSlotDialogClass", "Signals and slots", 0, QApplication::UnicodeUTF8));
+        slotGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Slots", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        addSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        addSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        removeSlotButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        removeSlotButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0, QApplication::UnicodeUTF8));
+        signalGroupBox->setTitle(QApplication::translate("SignalSlotDialogClass", "Signals", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        addSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Add", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        addSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        removeSignalButton->setToolTip(QApplication::translate("SignalSlotDialogClass", "Delete", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        removeSignalButton->setText(QApplication::translate("SignalSlotDialogClass", "...", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(SignalSlotDialogClass);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class SignalSlotDialogClass: public Ui_SignalSlotDialogClass {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // SIGNALSLOTDIALOG_H
diff --git a/tests/auto/uic/baseline/sslclient.ui b/tests/auto/uic/baseline/sslclient.ui
new file mode 100644
index 0000000..5a24751
--- /dev/null
+++ b/tests/auto/uic/baseline/sslclient.ui
@@ -0,0 +1,190 @@
+<ui version="4.0" >
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>343</width>
+    <height>320</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Secure Socket Client</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="hostNameLabel" >
+       <property name="text" >
+        <string>Host name:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="hostNameEdit" >
+       <property name="text" >
+        <string>imap.example.com</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="portLabel" >
+       <property name="text" >
+        <string>Port:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="portBox" >
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+       <property name="maximum" >
+        <number>65535</number>
+       </property>
+       <property name="value" >
+        <number>993</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QPushButton" name="connectButton" >
+     <property name="enabled" >
+      <bool>true</bool>
+     </property>
+     <property name="text" >
+      <string>Connect to host</string>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="sessionBox" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="title" >
+      <string>Active session</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="cipherText" >
+          <property name="text" >
+           <string>Cryptographic Cipher:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="cipherLabel" >
+          <property name="text" >
+           <string>&lt;none></string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QTextEdit" name="sessionOutput" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+        <property name="html" >
+         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="sessionInputLabel" >
+          <property name="text" >
+           <string>Input:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="sessionInput" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="sendButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::TabFocus</enum>
+          </property>
+          <property name="text" >
+           <string>&amp;Send</string>
+          </property>
+          <property name="default" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>hostNameEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>connectButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>126</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>142</x>
+     <y>78</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sessionInput</sender>
+   <signal>returnPressed()</signal>
+   <receiver>sendButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>142</x>
+     <y>241</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>297</x>
+     <y>234</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/sslclient.ui.h b/tests/auto/uic/baseline/sslclient.ui.h
new file mode 100644
index 0000000..1ca1c3f
--- /dev/null
+++ b/tests/auto/uic/baseline/sslclient.ui.h
@@ -0,0 +1,185 @@
+/********************************************************************************
+** Form generated from reading ui file 'sslclient.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef SSLCLIENT_H
+#define SSLCLIENT_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Form
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGridLayout *gridLayout;
+    QLabel *hostNameLabel;
+    QLineEdit *hostNameEdit;
+    QLabel *portLabel;
+    QSpinBox *portBox;
+    QPushButton *connectButton;
+    QGroupBox *sessionBox;
+    QVBoxLayout *vboxLayout1;
+    QHBoxLayout *hboxLayout;
+    QLabel *cipherText;
+    QLabel *cipherLabel;
+    QTextEdit *sessionOutput;
+    QHBoxLayout *hboxLayout1;
+    QLabel *sessionInputLabel;
+    QLineEdit *sessionInput;
+    QPushButton *sendButton;
+
+    void setupUi(QWidget *Form)
+    {
+        if (Form->objectName().isEmpty())
+            Form->setObjectName(QString::fromUtf8("Form"));
+        Form->resize(343, 320);
+        vboxLayout = new QVBoxLayout(Form);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        gridLayout = new QGridLayout();
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        hostNameLabel = new QLabel(Form);
+        hostNameLabel->setObjectName(QString::fromUtf8("hostNameLabel"));
+
+        gridLayout->addWidget(hostNameLabel, 0, 0, 1, 1);
+
+        hostNameEdit = new QLineEdit(Form);
+        hostNameEdit->setObjectName(QString::fromUtf8("hostNameEdit"));
+
+        gridLayout->addWidget(hostNameEdit, 0, 1, 1, 1);
+
+        portLabel = new QLabel(Form);
+        portLabel->setObjectName(QString::fromUtf8("portLabel"));
+
+        gridLayout->addWidget(portLabel, 1, 0, 1, 1);
+
+        portBox = new QSpinBox(Form);
+        portBox->setObjectName(QString::fromUtf8("portBox"));
+        portBox->setMinimum(1);
+        portBox->setMaximum(65535);
+        portBox->setValue(993);
+
+        gridLayout->addWidget(portBox, 1, 1, 1, 1);
+
+
+        vboxLayout->addLayout(gridLayout);
+
+        connectButton = new QPushButton(Form);
+        connectButton->setObjectName(QString::fromUtf8("connectButton"));
+        connectButton->setEnabled(true);
+        connectButton->setDefault(true);
+
+        vboxLayout->addWidget(connectButton);
+
+        sessionBox = new QGroupBox(Form);
+        sessionBox->setObjectName(QString::fromUtf8("sessionBox"));
+        sessionBox->setEnabled(false);
+        vboxLayout1 = new QVBoxLayout(sessionBox);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        cipherText = new QLabel(sessionBox);
+        cipherText->setObjectName(QString::fromUtf8("cipherText"));
+
+        hboxLayout->addWidget(cipherText);
+
+        cipherLabel = new QLabel(sessionBox);
+        cipherLabel->setObjectName(QString::fromUtf8("cipherLabel"));
+        cipherLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+        hboxLayout->addWidget(cipherLabel);
+
+
+        vboxLayout1->addLayout(hboxLayout);
+
+        sessionOutput = new QTextEdit(sessionBox);
+        sessionOutput->setObjectName(QString::fromUtf8("sessionOutput"));
+        sessionOutput->setEnabled(false);
+        sessionOutput->setFocusPolicy(Qt::NoFocus);
+        sessionOutput->setReadOnly(true);
+
+        vboxLayout1->addWidget(sessionOutput);
+
+        hboxLayout1 = new QHBoxLayout();
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        sessionInputLabel = new QLabel(sessionBox);
+        sessionInputLabel->setObjectName(QString::fromUtf8("sessionInputLabel"));
+
+        hboxLayout1->addWidget(sessionInputLabel);
+
+        sessionInput = new QLineEdit(sessionBox);
+        sessionInput->setObjectName(QString::fromUtf8("sessionInput"));
+        sessionInput->setEnabled(false);
+
+        hboxLayout1->addWidget(sessionInput);
+
+        sendButton = new QPushButton(sessionBox);
+        sendButton->setObjectName(QString::fromUtf8("sendButton"));
+        sendButton->setEnabled(false);
+        sendButton->setFocusPolicy(Qt::TabFocus);
+        sendButton->setDefault(true);
+
+        hboxLayout1->addWidget(sendButton);
+
+
+        vboxLayout1->addLayout(hboxLayout1);
+
+
+        vboxLayout->addWidget(sessionBox);
+
+
+        retranslateUi(Form);
+        QObject::connect(hostNameEdit, SIGNAL(returnPressed()), connectButton, SLOT(animateClick()));
+        QObject::connect(sessionInput, SIGNAL(returnPressed()), sendButton, SLOT(animateClick()));
+
+        QMetaObject::connectSlotsByName(Form);
+    } // setupUi
+
+    void retranslateUi(QWidget *Form)
+    {
+        Form->setWindowTitle(QApplication::translate("Form", "Secure Socket Client", 0, QApplication::UnicodeUTF8));
+        hostNameLabel->setText(QApplication::translate("Form", "Host name:", 0, QApplication::UnicodeUTF8));
+        hostNameEdit->setText(QApplication::translate("Form", "imap.example.com", 0, QApplication::UnicodeUTF8));
+        portLabel->setText(QApplication::translate("Form", "Port:", 0, QApplication::UnicodeUTF8));
+        connectButton->setText(QApplication::translate("Form", "Connect to host", 0, QApplication::UnicodeUTF8));
+        sessionBox->setTitle(QApplication::translate("Form", "Active session", 0, QApplication::UnicodeUTF8));
+        cipherText->setText(QApplication::translate("Form", "Cryptographic Cipher:", 0, QApplication::UnicodeUTF8));
+        cipherLabel->setText(QApplication::translate("Form", "<none>", 0, QApplication::UnicodeUTF8));
+        sessionOutput->setHtml(QApplication::translate("Form", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>", 0, QApplication::UnicodeUTF8));
+        sessionInputLabel->setText(QApplication::translate("Form", "Input:", 0, QApplication::UnicodeUTF8));
+        sendButton->setText(QApplication::translate("Form", "&Send", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Form);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Form: public Ui_Form {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // SSLCLIENT_H
diff --git a/tests/auto/uic/baseline/sslerrors.ui b/tests/auto/uic/baseline/sslerrors.ui
new file mode 100644
index 0000000..4aac18c
--- /dev/null
+++ b/tests/auto/uic/baseline/sslerrors.ui
@@ -0,0 +1,110 @@
+<ui version="4.0" >
+ <class>SslErrors</class>
+ <widget class="QDialog" name="SslErrors" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>371</width>
+    <height>216</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Unable To Validate The Connection</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600; color:#ff0000;">Warning&lt;/span>&lt;span style=" color:#ff0000;">:&lt;/span>&lt;span style=" color:#000000;"> One or more errors with this connection prevent validating the authenticity of the host you are connecting to. Please review the following list of errors, and click &lt;/span>&lt;span style=" color:#000000;">Ignore&lt;/span>&lt;span style=" color:#000000;"> to continue, or &lt;/span>&lt;span style=" color:#000000;">Cancel&lt;/span>&lt;span style=" color:#000000;"> to abort the connection.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="sslErrorList" />
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="certificateChainButton" >
+       <property name="text" >
+        <string>View Certificate Chain</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton" >
+       <property name="text" >
+        <string>Ignore</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_2" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton</sender>
+   <signal>clicked()</signal>
+   <receiver>SslErrors</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>235</x>
+     <y>185</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>228</x>
+     <y>287</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushButton_2</sender>
+   <signal>clicked()</signal>
+   <receiver>SslErrors</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>325</x>
+     <y>192</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>333</x>
+     <y>231</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/sslerrors.ui.h b/tests/auto/uic/baseline/sslerrors.ui.h
new file mode 100644
index 0000000..a1a46a1
--- /dev/null
+++ b/tests/auto/uic/baseline/sslerrors.ui.h
@@ -0,0 +1,112 @@
+/********************************************************************************
+** Form generated from reading ui file 'sslerrors.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef SSLERRORS_H
+#define SSLERRORS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListWidget>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_SslErrors
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QLabel *label;
+    QListWidget *sslErrorList;
+    QHBoxLayout *hboxLayout;
+    QPushButton *certificateChainButton;
+    QSpacerItem *spacerItem;
+    QPushButton *pushButton;
+    QPushButton *pushButton_2;
+
+    void setupUi(QDialog *SslErrors)
+    {
+        if (SslErrors->objectName().isEmpty())
+            SslErrors->setObjectName(QString::fromUtf8("SslErrors"));
+        SslErrors->resize(371, 216);
+        vboxLayout = new QVBoxLayout(SslErrors);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        label = new QLabel(SslErrors);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setWordWrap(true);
+
+        vboxLayout->addWidget(label);
+
+        sslErrorList = new QListWidget(SslErrors);
+        sslErrorList->setObjectName(QString::fromUtf8("sslErrorList"));
+
+        vboxLayout->addWidget(sslErrorList);
+
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        certificateChainButton = new QPushButton(SslErrors);
+        certificateChainButton->setObjectName(QString::fromUtf8("certificateChainButton"));
+        certificateChainButton->setAutoDefault(false);
+
+        hboxLayout->addWidget(certificateChainButton);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+        pushButton = new QPushButton(SslErrors);
+        pushButton->setObjectName(QString::fromUtf8("pushButton"));
+
+        hboxLayout->addWidget(pushButton);
+
+        pushButton_2 = new QPushButton(SslErrors);
+        pushButton_2->setObjectName(QString::fromUtf8("pushButton_2"));
+
+        hboxLayout->addWidget(pushButton_2);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+
+        retranslateUi(SslErrors);
+        QObject::connect(pushButton, SIGNAL(clicked()), SslErrors, SLOT(accept()));
+        QObject::connect(pushButton_2, SIGNAL(clicked()), SslErrors, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(SslErrors);
+    } // setupUi
+
+    void retranslateUi(QDialog *SslErrors)
+    {
+        SslErrors->setWindowTitle(QApplication::translate("SslErrors", "Unable To Validate The Connection", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("SslErrors", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600; color:#ff0000;\">Warning</span><span style=\" color:#ff0000;\">:</span><span style=\" color:#000000;\"> One or more errors with this connection prevent validating the authenticity of the host you are connecting to. Please review the following list of errors, and click </span><span style=\" color:#000000;\">Ignore</span><span style=\" color:#000000;\"> to continue, or </span><span style=\" color:#000000;\">Cancel</span><span style=\" color:#000000;\"> to abort the connection.</span></p></body></html>", 0, QApplication::UnicodeUTF8));
+        certificateChainButton->setText(QApplication::translate("SslErrors", "View Certificate Chain", 0, QApplication::UnicodeUTF8));
+        pushButton->setText(QApplication::translate("SslErrors", "Ignore", 0, QApplication::UnicodeUTF8));
+        pushButton_2->setText(QApplication::translate("SslErrors", "Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(SslErrors);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class SslErrors: public Ui_SslErrors {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // SSLERRORS_H
diff --git a/tests/auto/uic/baseline/statistics.ui b/tests/auto/uic/baseline/statistics.ui
new file mode 100644
index 0000000..a9dc546
--- /dev/null
+++ b/tests/auto/uic/baseline/statistics.ui
@@ -0,0 +1,241 @@
+<ui version="4.0" stdsetdef="1" >
+  <class>Statistics</class>
+  <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+  <widget class="QDialog" name="Statistics" >
+    <property name="objectName" >
+      <string notr="true" >linguist_stats</string>
+    </property>
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>336</width>
+        <height>164</height>
+      </rect>
+    </property>
+    <property name="windowTitle" >
+      <string>Statistics</string>
+    </property>
+    <layout class="QGridLayout" >
+      <property name="objectName" >
+        <string notr="true" >unnamed</string>
+      </property>
+      <item row="1" column="0" >
+        <layout class="QHBoxLayout" >
+          <property name="objectName" >
+            <string notr="true" >unnamed</string>
+          </property>
+          <item>
+            <spacer name="spacer4_2" >
+              <property name="sizeHint" >
+                <size>
+                  <width>40</width>
+                  <height>20</height>
+                </size>
+              </property>
+              <property name="sizeType" >
+                <enum>Expanding</enum>
+              </property>
+              <property name="orientation" >
+                <enum>Horizontal</enum>
+              </property>
+            </spacer>
+          </item>
+          <item>
+            <widget class="QPushButton" name="closeBtn" >
+              <property name="objectName" >
+                <string notr="true" >closeBtn</string>
+              </property>
+              <property name="text" >
+                <string>&amp;Close</string>
+              </property>
+            </widget>
+          </item>
+          <item>
+            <spacer name="spacer4" >
+              <property name="sizeHint" >
+                <size>
+                  <width>40</width>
+                  <height>20</height>
+                </size>
+              </property>
+              <property name="sizeType" >
+                <enum>Expanding</enum>
+              </property>
+              <property name="orientation" >
+                <enum>Horizontal</enum>
+              </property>
+            </spacer>
+          </item>
+        </layout>
+      </item>
+      <item row="0" column="0" >
+        <widget class="QFrame" name="frame4" >
+          <property name="objectName" >
+            <string notr="true" >frame4</string>
+          </property>
+          <property name="frameShape" >
+            <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow" >
+            <enum>QFrame::Raised</enum>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="objectName" >
+              <string notr="true" >unnamed</string>
+            </property>
+            <item row="0" column="2" >
+              <widget class="QLabel" name="textLabel4" >
+                <property name="objectName" >
+                  <string notr="true" >textLabel4</string>
+                </property>
+                <property name="text" >
+                  <string>Translation</string>
+                </property>
+              </widget>
+            </item>
+            <item row="0" column="1" >
+              <widget class="QLabel" name="textLabel5" >
+                <property name="objectName" >
+                  <string notr="true" >textLabel5</string>
+                </property>
+                <property name="text" >
+                  <string>Source</string>
+                </property>
+              </widget>
+            </item>
+            <item row="1" column="1" >
+              <widget class="QLabel" name="untrWords" >
+                <property name="objectName" >
+                  <string notr="true" >untrWords</string>
+                </property>
+                <property name="text" >
+                  <string>0</string>
+                </property>
+              </widget>
+            </item>
+            <item row="1" column="2" >
+              <widget class="QLabel" name="trWords" >
+                <property name="objectName" >
+                  <string notr="true" >trWords</string>
+                </property>
+                <property name="text" >
+                  <string>0</string>
+                </property>
+              </widget>
+            </item>
+            <item row="1" column="0" >
+              <widget class="QLabel" name="textLabel1" >
+                <property name="objectName" >
+                  <string notr="true" >textLabel1</string>
+                </property>
+                <property name="text" >
+                  <string>Words:</string>
+                </property>
+              </widget>
+            </item>
+            <item row="2" column="2" >
+              <widget class="QLabel" name="trChars" >
+                <property name="objectName" >
+                  <string notr="true" >trChars</string>
+                </property>
+                <property name="text" >
+                  <string>0</string>
+                </property>
+              </widget>
+            </item>
+            <item row="2" column="1" >
+              <widget class="QLabel" name="untrChars" >
+                <property name="objectName" >
+                  <string notr="true" >untrChars</string>
+                </property>
+                <property name="text" >
+                  <string>0</string>
+                </property>
+              </widget>
+            </item>
+            <item row="2" column="0" >
+              <widget class="QLabel" name="textLabel3" >
+                <property name="objectName" >
+                  <string notr="true" >textLabel3</string>
+                </property>
+                <property name="text" >
+                  <string>Characters:</string>
+                </property>
+              </widget>
+            </item>
+            <item row="3" column="0" >
+              <widget class="QLabel" name="textLabel6" >
+                <property name="objectName" >
+                  <string notr="true" >textLabel6</string>
+                </property>
+                <property name="text" >
+                  <string>Characters (with spaces):</string>
+                </property>
+              </widget>
+            </item>
+            <item row="3" column="2" >
+              <widget class="QLabel" name="trCharsSpc" >
+                <property name="objectName" >
+                  <string notr="true" >trCharsSpc</string>
+                </property>
+                <property name="text" >
+                  <string>0</string>
+                </property>
+              </widget>
+            </item>
+            <item row="3" column="1" >
+              <widget class="QLabel" name="untrCharsSpc" >
+                <property name="objectName" >
+                  <string notr="true" >untrCharsSpc</string>
+                </property>
+                <property name="text" >
+                  <string>0</string>
+                </property>
+              </widget>
+            </item>
+          </layout>
+        </widget>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+</ui>
diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/uic/baseline/statistics.ui.h
new file mode 100644
index 0000000..eb24cfe
--- /dev/null
+++ b/tests/auto/uic/baseline/statistics.ui.h
@@ -0,0 +1,222 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'statistics.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef STATISTICS_H
+#define STATISTICS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Statistics
+{
+public:
+    QGridLayout *gridLayout;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacer4_2;
+    QPushButton *closeBtn;
+    QSpacerItem *spacer4;
+    QFrame *frame4;
+    QGridLayout *gridLayout1;
+    QLabel *textLabel4;
+    QLabel *textLabel5;
+    QLabel *untrWords;
+    QLabel *trWords;
+    QLabel *textLabel1;
+    QLabel *trChars;
+    QLabel *untrChars;
+    QLabel *textLabel3;
+    QLabel *textLabel6;
+    QLabel *trCharsSpc;
+    QLabel *untrCharsSpc;
+
+    void setupUi(QDialog *Statistics)
+    {
+        if (Statistics->objectName().isEmpty())
+            Statistics->setObjectName(QString::fromUtf8("Statistics"));
+        Statistics->setObjectName(QString::fromUtf8("linguist_stats"));
+        Statistics->resize(336, 164);
+        gridLayout = new QGridLayout(Statistics);
+        gridLayout->setSpacing(6);
+        gridLayout->setMargin(11);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8("unnamed"));
+        hboxLayout = new QHBoxLayout();
+        hboxLayout->setSpacing(6);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
+        spacer4_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacer4_2);
+
+        closeBtn = new QPushButton(Statistics);
+        closeBtn->setObjectName(QString::fromUtf8("closeBtn"));
+
+        hboxLayout->addWidget(closeBtn);
+
+        spacer4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacer4);
+
+
+        gridLayout->addLayout(hboxLayout, 1, 0, 1, 1);
+
+        frame4 = new QFrame(Statistics);
+        frame4->setObjectName(QString::fromUtf8("frame4"));
+        frame4->setFrameShape(QFrame::StyledPanel);
+        frame4->setFrameShadow(QFrame::Raised);
+        gridLayout1 = new QGridLayout(frame4);
+        gridLayout1->setSpacing(6);
+        gridLayout1->setMargin(11);
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        gridLayout1->setObjectName(QString::fromUtf8("unnamed"));
+        textLabel4 = new QLabel(frame4);
+        textLabel4->setObjectName(QString::fromUtf8("textLabel4"));
+
+        gridLayout1->addWidget(textLabel4, 0, 2, 1, 1);
+
+        textLabel5 = new QLabel(frame4);
+        textLabel5->setObjectName(QString::fromUtf8("textLabel5"));
+
+        gridLayout1->addWidget(textLabel5, 0, 1, 1, 1);
+
+        untrWords = new QLabel(frame4);
+        untrWords->setObjectName(QString::fromUtf8("untrWords"));
+
+        gridLayout1->addWidget(untrWords, 1, 1, 1, 1);
+
+        trWords = new QLabel(frame4);
+        trWords->setObjectName(QString::fromUtf8("trWords"));
+
+        gridLayout1->addWidget(trWords, 1, 2, 1, 1);
+
+        textLabel1 = new QLabel(frame4);
+        textLabel1->setObjectName(QString::fromUtf8("textLabel1"));
+
+        gridLayout1->addWidget(textLabel1, 1, 0, 1, 1);
+
+        trChars = new QLabel(frame4);
+        trChars->setObjectName(QString::fromUtf8("trChars"));
+
+        gridLayout1->addWidget(trChars, 2, 2, 1, 1);
+
+        untrChars = new QLabel(frame4);
+        untrChars->setObjectName(QString::fromUtf8("untrChars"));
+
+        gridLayout1->addWidget(untrChars, 2, 1, 1, 1);
+
+        textLabel3 = new QLabel(frame4);
+        textLabel3->setObjectName(QString::fromUtf8("textLabel3"));
+
+        gridLayout1->addWidget(textLabel3, 2, 0, 1, 1);
+
+        textLabel6 = new QLabel(frame4);
+        textLabel6->setObjectName(QString::fromUtf8("textLabel6"));
+
+        gridLayout1->addWidget(textLabel6, 3, 0, 1, 1);
+
+        trCharsSpc = new QLabel(frame4);
+        trCharsSpc->setObjectName(QString::fromUtf8("trCharsSpc"));
+
+        gridLayout1->addWidget(trCharsSpc, 3, 2, 1, 1);
+
+        untrCharsSpc = new QLabel(frame4);
+        untrCharsSpc->setObjectName(QString::fromUtf8("untrCharsSpc"));
+
+        gridLayout1->addWidget(untrCharsSpc, 3, 1, 1, 1);
+
+
+        gridLayout->addWidget(frame4, 0, 0, 1, 1);
+
+
+        retranslateUi(Statistics);
+
+        QMetaObject::connectSlotsByName(Statistics);
+    } // setupUi
+
+    void retranslateUi(QDialog *Statistics)
+    {
+        Statistics->setWindowTitle(QApplication::translate("Statistics", "Statistics", 0, QApplication::UnicodeUTF8));
+        closeBtn->setText(QApplication::translate("Statistics", "&Close", 0, QApplication::UnicodeUTF8));
+        textLabel4->setText(QApplication::translate("Statistics", "Translation", 0, QApplication::UnicodeUTF8));
+        textLabel5->setText(QApplication::translate("Statistics", "Source", 0, QApplication::UnicodeUTF8));
+        untrWords->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
+        trWords->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
+        textLabel1->setText(QApplication::translate("Statistics", "Words:", 0, QApplication::UnicodeUTF8));
+        trChars->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
+        untrChars->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
+        textLabel3->setText(QApplication::translate("Statistics", "Characters:", 0, QApplication::UnicodeUTF8));
+        textLabel6->setText(QApplication::translate("Statistics", "Characters (with spaces):", 0, QApplication::UnicodeUTF8));
+        trCharsSpc->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
+        untrCharsSpc->setText(QApplication::translate("Statistics", "0", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Statistics);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Statistics: public Ui_Statistics {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // STATISTICS_H
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui b/tests/auto/uic/baseline/stringlisteditor.ui
new file mode 100644
index 0000000..67369de
--- /dev/null
+++ b/tests/auto/uic/baseline/stringlisteditor.ui
@@ -0,0 +1,264 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::Dialog</class>
+ <widget class="QDialog" name="qdesigner_internal::Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>StringList</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" colspan="2" >
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout" >
+          <property name="margin" >
+           <number>0</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QToolButton" name="newButton" >
+            <property name="toolTip" >
+             <string>New String</string>
+            </property>
+            <property name="text" >
+             <string>&amp;New</string>
+            </property>
+            <property name="toolButtonStyle" >
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="deleteButton" >
+            <property name="toolTip" >
+             <string>Delete String</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Delete</string>
+            </property>
+            <property name="toolButtonStyle" >
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" >
+          <property name="margin" >
+           <number>0</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>&amp;Value:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>valueEdit</cstring>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="valueEdit" />
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="1" >
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QToolButton" name="upButton" >
+          <property name="toolTip" >
+           <string>Move String Up</string>
+          </property>
+          <property name="text" >
+           <string>Up</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="downButton" >
+          <property name="toolTip" >
+           <string>Move String Down</string>
+          </property>
+          <property name="text" >
+           <string>Down</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QListView" name="listView" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qdesigner_internal::Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>258</x>
+     <y>283</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>138</x>
+     <y>294</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qdesigner_internal::Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>350</x>
+     <y>284</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>369</x>
+     <y>295</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/uic/baseline/stringlisteditor.ui.h
new file mode 100644
index 0000000..ffba0af
--- /dev/null
+++ b/tests/auto/uic/baseline/stringlisteditor.ui.h
@@ -0,0 +1,267 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'stringlisteditor.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef STRINGLISTEDITOR_H
+#define STRINGLISTEDITOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QListView>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_Dialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout;
+    QVBoxLayout *vboxLayout1;
+    QHBoxLayout *hboxLayout;
+    QToolButton *newButton;
+    QToolButton *deleteButton;
+    QSpacerItem *spacerItem;
+    QHBoxLayout *hboxLayout1;
+    QLabel *label;
+    QLineEdit *valueEdit;
+    QVBoxLayout *vboxLayout2;
+    QSpacerItem *spacerItem1;
+    QToolButton *upButton;
+    QToolButton *downButton;
+    QSpacerItem *spacerItem2;
+    QListView *listView;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *qdesigner_internal__Dialog)
+    {
+        if (qdesigner_internal__Dialog->objectName().isEmpty())
+            qdesigner_internal__Dialog->setObjectName(QString::fromUtf8("qdesigner_internal__Dialog"));
+        qdesigner_internal__Dialog->resize(400, 300);
+        vboxLayout = new QVBoxLayout(qdesigner_internal__Dialog);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(qdesigner_internal__Dialog);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        gridLayout = new QGridLayout(groupBox);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        vboxLayout1 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(0);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(0);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        newButton = new QToolButton(groupBox);
+        newButton->setObjectName(QString::fromUtf8("newButton"));
+        newButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+        hboxLayout->addWidget(newButton);
+
+        deleteButton = new QToolButton(groupBox);
+        deleteButton->setObjectName(QString::fromUtf8("deleteButton"));
+        deleteButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+        hboxLayout->addWidget(deleteButton);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout1->addLayout(hboxLayout);
+
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+        hboxLayout1->setMargin(0);
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        hboxLayout1->addWidget(label);
+
+        valueEdit = new QLineEdit(groupBox);
+        valueEdit->setObjectName(QString::fromUtf8("valueEdit"));
+
+        hboxLayout1->addWidget(valueEdit);
+
+
+        vboxLayout1->addLayout(hboxLayout1);
+
+
+        gridLayout->addLayout(vboxLayout1, 1, 0, 1, 2);
+
+        vboxLayout2 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+        vboxLayout2->setMargin(0);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout2->addItem(spacerItem1);
+
+        upButton = new QToolButton(groupBox);
+        upButton->setObjectName(QString::fromUtf8("upButton"));
+
+        vboxLayout2->addWidget(upButton);
+
+        downButton = new QToolButton(groupBox);
+        downButton->setObjectName(QString::fromUtf8("downButton"));
+
+        vboxLayout2->addWidget(downButton);
+
+        spacerItem2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout2->addItem(spacerItem2);
+
+
+        gridLayout->addLayout(vboxLayout2, 0, 1, 1, 1);
+
+        listView = new QListView(groupBox);
+        listView->setObjectName(QString::fromUtf8("listView"));
+
+        gridLayout->addWidget(listView, 0, 0, 1, 1);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        buttonBox = new QDialogButtonBox(qdesigner_internal__Dialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(valueEdit);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(qdesigner_internal__Dialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__Dialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__Dialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__Dialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__Dialog)
+    {
+        qdesigner_internal__Dialog->setWindowTitle(QApplication::translate("qdesigner_internal::Dialog", "Dialog", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("qdesigner_internal::Dialog", "StringList", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        newButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "New String", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        deleteButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Delete String", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        deleteButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&Delete", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::Dialog", "&Value:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        upButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        upButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Up", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        downButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        downButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Down", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__Dialog);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class Dialog: public Ui_Dialog {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // STRINGLISTEDITOR_H
diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui b/tests/auto/uic/baseline/stylesheeteditor.ui
new file mode 100644
index 0000000..34cd7f6
--- /dev/null
+++ b/tests/auto/uic/baseline/stylesheeteditor.ui
@@ -0,0 +1,171 @@
+<ui version="4.0" >
+ <class>StyleSheetEditor</class>
+ <widget class="QWidget" name="StyleSheetEditor" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>445</width>
+    <height>289</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Style Editor</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="6" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>32</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>32</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="5" >
+    <widget class="QComboBox" name="styleSheetCombo" >
+     <item>
+      <property name="text" >
+       <string>Default</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Coffee</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Pagefold</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>10</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="2" >
+    <widget class="QComboBox" name="styleCombo" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLabel" name="label_7" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>0</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Style:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="7" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>321</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>&amp;Apply</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="7" >
+    <widget class="QTextEdit" name="styleTextEdit" />
+   </item>
+   <item row="0" column="4" >
+    <widget class="QLabel" name="label_8" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>0</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Style Sheet:</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui.h b/tests/auto/uic/baseline/stylesheeteditor.ui.h
new file mode 100644
index 0000000..9f803c6
--- /dev/null
+++ b/tests/auto/uic/baseline/stylesheeteditor.ui.h
@@ -0,0 +1,155 @@
+/********************************************************************************
+** Form generated from reading ui file 'stylesheeteditor.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef STYLESHEETEDITOR_H
+#define STYLESHEETEDITOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTextEdit>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_StyleSheetEditor
+{
+public:
+    QGridLayout *gridLayout;
+    QSpacerItem *spacerItem;
+    QSpacerItem *spacerItem1;
+    QComboBox *styleSheetCombo;
+    QSpacerItem *spacerItem2;
+    QComboBox *styleCombo;
+    QLabel *label_7;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *spacerItem3;
+    QPushButton *applyButton;
+    QTextEdit *styleTextEdit;
+    QLabel *label_8;
+
+    void setupUi(QWidget *StyleSheetEditor)
+    {
+        if (StyleSheetEditor->objectName().isEmpty())
+            StyleSheetEditor->setObjectName(QString::fromUtf8("StyleSheetEditor"));
+        StyleSheetEditor->resize(445, 289);
+        gridLayout = new QGridLayout(StyleSheetEditor);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        spacerItem = new QSpacerItem(32, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem, 0, 6, 1, 1);
+
+        spacerItem1 = new QSpacerItem(32, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem1, 0, 0, 1, 1);
+
+        styleSheetCombo = new QComboBox(StyleSheetEditor);
+        styleSheetCombo->setObjectName(QString::fromUtf8("styleSheetCombo"));
+
+        gridLayout->addWidget(styleSheetCombo, 0, 5, 1, 1);
+
+        spacerItem2 = new QSpacerItem(10, 16, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem2, 0, 3, 1, 1);
+
+        styleCombo = new QComboBox(StyleSheetEditor);
+        styleCombo->setObjectName(QString::fromUtf8("styleCombo"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(styleCombo->sizePolicy().hasHeightForWidth());
+        styleCombo->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(styleCombo, 0, 2, 1, 1);
+
+        label_7 = new QLabel(StyleSheetEditor);
+        label_7->setObjectName(QString::fromUtf8("label_7"));
+        QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(5));
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(label_7->sizePolicy().hasHeightForWidth());
+        label_7->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(label_7, 0, 1, 1, 1);
+
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        spacerItem3 = new QSpacerItem(321, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem3);
+
+        applyButton = new QPushButton(StyleSheetEditor);
+        applyButton->setObjectName(QString::fromUtf8("applyButton"));
+        applyButton->setEnabled(false);
+
+        hboxLayout->addWidget(applyButton);
+
+
+        gridLayout->addLayout(hboxLayout, 2, 0, 1, 7);
+
+        styleTextEdit = new QTextEdit(StyleSheetEditor);
+        styleTextEdit->setObjectName(QString::fromUtf8("styleTextEdit"));
+
+        gridLayout->addWidget(styleTextEdit, 1, 0, 1, 7);
+
+        label_8 = new QLabel(StyleSheetEditor);
+        label_8->setObjectName(QString::fromUtf8("label_8"));
+        sizePolicy1.setHeightForWidth(label_8->sizePolicy().hasHeightForWidth());
+        label_8->setSizePolicy(sizePolicy1);
+
+        gridLayout->addWidget(label_8, 0, 4, 1, 1);
+
+
+        retranslateUi(StyleSheetEditor);
+
+        QMetaObject::connectSlotsByName(StyleSheetEditor);
+    } // setupUi
+
+    void retranslateUi(QWidget *StyleSheetEditor)
+    {
+        StyleSheetEditor->setWindowTitle(QApplication::translate("StyleSheetEditor", "Style Editor", 0, QApplication::UnicodeUTF8));
+        styleSheetCombo->clear();
+        styleSheetCombo->insertItems(0, QStringList()
+         << QApplication::translate("StyleSheetEditor", "Default", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("StyleSheetEditor", "Coffee", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("StyleSheetEditor", "Pagefold", 0, QApplication::UnicodeUTF8)
+        );
+        label_7->setText(QApplication::translate("StyleSheetEditor", "Style:", 0, QApplication::UnicodeUTF8));
+        applyButton->setText(QApplication::translate("StyleSheetEditor", "&Apply", 0, QApplication::UnicodeUTF8));
+        label_8->setText(QApplication::translate("StyleSheetEditor", "Style Sheet:", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(StyleSheetEditor);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class StyleSheetEditor: public Ui_StyleSheetEditor {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // STYLESHEETEDITOR_H
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui b/tests/auto/uic/baseline/tabbedbrowser.ui
new file mode 100644
index 0000000..2149221
--- /dev/null
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui
@@ -0,0 +1,232 @@
+<ui version="4.0" >
+ <author></author>
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Assistant of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <exportmacro></exportmacro>
+ <class>TabbedBrowser</class>
+ <widget class="QWidget" name="TabbedBrowser" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>710</width>
+    <height>664</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>TabbedBrowser</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tab" >
+     <widget class="QWidget" name="frontpage" >
+      <attribute name="title" >
+       <string>Untitled</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>8</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="frameFind" >
+     <property name="frameShape" >
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QToolButton" name="toolClose" >
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="icon" >
+         <iconset resource="assistant.qrc" >:/trolltech/assistant/images/close.png</iconset>
+        </property>
+        <property name="autoRaise" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="editFind" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="toolPrevious" >
+        <property name="text" >
+         <string>Previous</string>
+        </property>
+        <property name="icon" >
+         <iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/previous.png</iconset>
+        </property>
+        <property name="toolButtonStyle" >
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
+        <property name="autoRaise" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="toolNext" >
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text" >
+         <string>Next</string>
+        </property>
+        <property name="icon" >
+         <iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/next.png</iconset>
+        </property>
+        <property name="toolButtonStyle" >
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
+        <property name="autoRaise" >
+         <bool>true</bool>
+        </property>
+        <property name="arrowType" >
+         <enum>Qt::NoArrow</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkCase" >
+        <property name="text" >
+         <string>Case Sensitive</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkWholeWords" >
+        <property name="text" >
+         <string>Whole words</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelWrapped" >
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>20</height>
+         </size>
+        </property>
+        <property name="maximumSize" >
+         <size>
+          <width>105</width>
+          <height>20</height>
+         </size>
+        </property>
+        <property name="text" >
+         <string>&lt;img src=":/trolltech/assistant/images/wrap.png">&amp;nbsp;Search wrapped</string>
+        </property>
+        <property name="textFormat" >
+         <enum>Qt::RichText</enum>
+        </property>
+        <property name="scaledContents" >
+         <bool>true</bool>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>81</width>
+          <height>21</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources>
+  <include location="assistant.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/uic/baseline/tabbedbrowser.ui.h
new file mode 100644
index 0000000..ecf9024
--- /dev/null
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui.h
@@ -0,0 +1,218 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Assistant of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'tabbedbrowser.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TABBEDBROWSER_H
+#define TABBEDBROWSER_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTabWidget>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_TabbedBrowser
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QTabWidget *tab;
+    QWidget *frontpage;
+    QGridLayout *gridLayout;
+    QFrame *frameFind;
+    QHBoxLayout *hboxLayout;
+    QToolButton *toolClose;
+    QLineEdit *editFind;
+    QToolButton *toolPrevious;
+    QToolButton *toolNext;
+    QCheckBox *checkCase;
+    QCheckBox *checkWholeWords;
+    QLabel *labelWrapped;
+    QSpacerItem *spacerItem;
+
+    void setupUi(QWidget *TabbedBrowser)
+    {
+        if (TabbedBrowser->objectName().isEmpty())
+            TabbedBrowser->setObjectName(QString::fromUtf8("TabbedBrowser"));
+        TabbedBrowser->resize(710, 664);
+        vboxLayout = new QVBoxLayout(TabbedBrowser);
+        vboxLayout->setSpacing(0);
+        vboxLayout->setMargin(0);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        tab = new QTabWidget(TabbedBrowser);
+        tab->setObjectName(QString::fromUtf8("tab"));
+        frontpage = new QWidget();
+        frontpage->setObjectName(QString::fromUtf8("frontpage"));
+        gridLayout = new QGridLayout(frontpage);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+        gridLayout->setMargin(8);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        tab->addTab(frontpage, QString());
+
+        vboxLayout->addWidget(tab);
+
+        frameFind = new QFrame(TabbedBrowser);
+        frameFind->setObjectName(QString::fromUtf8("frameFind"));
+        frameFind->setFrameShape(QFrame::StyledPanel);
+        frameFind->setFrameShadow(QFrame::Raised);
+        hboxLayout = new QHBoxLayout(frameFind);
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        toolClose = new QToolButton(frameFind);
+        toolClose->setObjectName(QString::fromUtf8("toolClose"));
+        const QIcon icon = QIcon(QString::fromUtf8(":/trolltech/assistant/images/close.png"));
+        toolClose->setIcon(icon);
+        toolClose->setAutoRaise(true);
+
+        hboxLayout->addWidget(toolClose);
+
+        editFind = new QLineEdit(frameFind);
+        editFind->setObjectName(QString::fromUtf8("editFind"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(editFind->sizePolicy().hasHeightForWidth());
+        editFind->setSizePolicy(sizePolicy);
+        editFind->setMinimumSize(QSize(150, 0));
+
+        hboxLayout->addWidget(editFind);
+
+        toolPrevious = new QToolButton(frameFind);
+        toolPrevious->setObjectName(QString::fromUtf8("toolPrevious"));
+        const QIcon icon1 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/previous.png"));
+        toolPrevious->setIcon(icon1);
+        toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        toolPrevious->setAutoRaise(true);
+
+        hboxLayout->addWidget(toolPrevious);
+
+        toolNext = new QToolButton(frameFind);
+        toolNext->setObjectName(QString::fromUtf8("toolNext"));
+        toolNext->setMinimumSize(QSize(0, 0));
+        const QIcon icon2 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/next.png"));
+        toolNext->setIcon(icon2);
+        toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        toolNext->setAutoRaise(true);
+        toolNext->setArrowType(Qt::NoArrow);
+
+        hboxLayout->addWidget(toolNext);
+
+        checkCase = new QCheckBox(frameFind);
+        checkCase->setObjectName(QString::fromUtf8("checkCase"));
+
+        hboxLayout->addWidget(checkCase);
+
+        checkWholeWords = new QCheckBox(frameFind);
+        checkWholeWords->setObjectName(QString::fromUtf8("checkWholeWords"));
+
+        hboxLayout->addWidget(checkWholeWords);
+
+        labelWrapped = new QLabel(frameFind);
+        labelWrapped->setObjectName(QString::fromUtf8("labelWrapped"));
+        labelWrapped->setMinimumSize(QSize(0, 20));
+        labelWrapped->setMaximumSize(QSize(105, 20));
+        labelWrapped->setTextFormat(Qt::RichText);
+        labelWrapped->setScaledContents(true);
+        labelWrapped->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+
+        hboxLayout->addWidget(labelWrapped);
+
+        spacerItem = new QSpacerItem(81, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout->addWidget(frameFind);
+
+
+        retranslateUi(TabbedBrowser);
+
+        QMetaObject::connectSlotsByName(TabbedBrowser);
+    } // setupUi
+
+    void retranslateUi(QWidget *TabbedBrowser)
+    {
+        TabbedBrowser->setWindowTitle(QApplication::translate("TabbedBrowser", "TabbedBrowser", 0, QApplication::UnicodeUTF8));
+        tab->setTabText(tab->indexOf(frontpage), QApplication::translate("TabbedBrowser", "Untitled", 0, QApplication::UnicodeUTF8));
+        toolClose->setText(QString());
+        toolPrevious->setText(QApplication::translate("TabbedBrowser", "Previous", 0, QApplication::UnicodeUTF8));
+        toolNext->setText(QApplication::translate("TabbedBrowser", "Next", 0, QApplication::UnicodeUTF8));
+        checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", 0, QApplication::UnicodeUTF8));
+        checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", 0, QApplication::UnicodeUTF8));
+        labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/trolltech/assistant/images/wrap.png\">&nbsp;Search wrapped", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(TabbedBrowser);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class TabbedBrowser: public Ui_TabbedBrowser {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // TABBEDBROWSER_H
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui b/tests/auto/uic/baseline/tablewidgeteditor.ui
new file mode 100644
index 0000000..a914e08
--- /dev/null
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui
@@ -0,0 +1,402 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::TableWidgetEditor</class>
+ <widget class="QDialog" name="qdesigner_internal::TableWidgetEditor" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>591</width>
+    <height>455</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Edit Table Widget</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_4" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="itemsBox" >
+     <property name="title" >
+      <string>Table Items</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QTableWidget" name="tableWidget" >
+        <property name="toolTip" >
+         <string>Table Items</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout_5" >
+        <item>
+         <widget class="QLabel" name="label_3" >
+          <property name="text" >
+           <string>Icon</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="qdesigner_internal::IconSelector" native="1" name="itemIconSelector" />
+        </item>
+        <item>
+         <spacer name="horizontalSpacer" >
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QWidget" native="1" name="widget" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QGroupBox" name="columnsBox" >
+        <property name="title" >
+         <string>Columns</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_2" >
+         <item row="0" column="0" >
+          <widget class="QListWidget" name="columnsListWidget" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Expanding" hsizetype="Ignored" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="focusPolicy" >
+            <enum>Qt::TabFocus</enum>
+           </property>
+           <property name="toolTip" >
+            <string>Table Columns</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" >
+          <layout class="QHBoxLayout" name="horizontalLayout_3" >
+           <item>
+            <widget class="QToolButton" name="newColumnButton" >
+             <property name="toolTip" >
+              <string>New Column</string>
+             </property>
+             <property name="text" >
+              <string>New</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="deleteColumnButton" >
+             <property name="toolTip" >
+              <string>Delete Column</string>
+             </property>
+             <property name="text" >
+              <string>Delete</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0" >
+              <size>
+               <width>0</width>
+               <height>23</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QToolButton" name="moveColumnUpButton" >
+             <property name="toolTip" >
+              <string>Move Column Up</string>
+             </property>
+             <property name="text" >
+              <string>U</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="moveColumnDownButton" >
+             <property name="toolTip" >
+              <string>Move Column Down</string>
+             </property>
+             <property name="text" >
+              <string>D</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="0" >
+          <layout class="QHBoxLayout" name="horizontalLayout_2" >
+           <item>
+            <widget class="QLabel" name="label" >
+             <property name="text" >
+              <string>Icon</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="qdesigner_internal::IconSelector" native="1" name="columnIconSelector" />
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0" >
+              <size>
+               <width>0</width>
+               <height>21</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="rowsBox" >
+        <property name="title" >
+         <string>Rows</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_3" >
+         <item row="0" column="0" >
+          <widget class="QListWidget" name="rowsListWidget" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Expanding" hsizetype="Ignored" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="focusPolicy" >
+            <enum>Qt::TabFocus</enum>
+           </property>
+           <property name="toolTip" >
+            <string>Table Rows</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" >
+          <layout class="QHBoxLayout" name="horizontalLayout_4" >
+           <item>
+            <widget class="QToolButton" name="newRowButton" >
+             <property name="toolTip" >
+              <string>New Row</string>
+             </property>
+             <property name="text" >
+              <string>New</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="deleteRowButton" >
+             <property name="toolTip" >
+              <string>Delete Row</string>
+             </property>
+             <property name="text" >
+              <string>Delete</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0" >
+              <size>
+               <width>0</width>
+               <height>23</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QToolButton" name="moveRowUpButton" >
+             <property name="toolTip" >
+              <string>Move Row Up</string>
+             </property>
+             <property name="text" >
+              <string>U</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="moveRowDownButton" >
+             <property name="toolTip" >
+              <string>Move Row Down</string>
+             </property>
+             <property name="text" >
+              <string>D</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="0" >
+          <layout class="QHBoxLayout" name="horizontalLayout" >
+           <item>
+            <widget class="QLabel" name="label_2" >
+             <property name="text" >
+              <string>Icon</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="qdesigner_internal::IconSelector" native="1" name="rowIconSelector" />
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0" >
+              <size>
+               <width>0</width>
+               <height>21</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+  <zorder>itemsBox</zorder>
+  <zorder>buttonBox</zorder>
+  <zorder>widget</zorder>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qdesigner_internal::IconSelector</class>
+   <extends>QWidget</extends>
+   <header>iconselector_p.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>tableWidget</tabstop>
+  <tabstop>columnsListWidget</tabstop>
+  <tabstop>newColumnButton</tabstop>
+  <tabstop>deleteColumnButton</tabstop>
+  <tabstop>moveColumnUpButton</tabstop>
+  <tabstop>moveColumnDownButton</tabstop>
+  <tabstop>rowsListWidget</tabstop>
+  <tabstop>newRowButton</tabstop>
+  <tabstop>deleteRowButton</tabstop>
+  <tabstop>moveRowUpButton</tabstop>
+  <tabstop>moveRowDownButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qdesigner_internal::TableWidgetEditor</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>431</x>
+     <y>351</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>373</x>
+     <y>362</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qdesigner_internal::TableWidgetEditor</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>547</x>
+     <y>354</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>562</x>
+     <y>362</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
new file mode 100644
index 0000000..47649ec
--- /dev/null
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
@@ -0,0 +1,392 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'tablewidgeteditor.ui'
+**
+** Created: Mon Jun 16 17:48:45 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TABLEWIDGETEDITOR_H
+#define TABLEWIDGETEDITOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTableWidget>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "iconselector_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_TableWidgetEditor
+{
+public:
+    QGridLayout *gridLayout_4;
+    QGroupBox *itemsBox;
+    QGridLayout *gridLayout;
+    QTableWidget *tableWidget;
+    QHBoxLayout *horizontalLayout_5;
+    QLabel *label_3;
+    qdesigner_internal::IconSelector *itemIconSelector;
+    QSpacerItem *horizontalSpacer;
+    QDialogButtonBox *buttonBox;
+    QWidget *widget;
+    QVBoxLayout *verticalLayout;
+    QGroupBox *columnsBox;
+    QGridLayout *gridLayout_2;
+    QListWidget *columnsListWidget;
+    QHBoxLayout *horizontalLayout_3;
+    QToolButton *newColumnButton;
+    QToolButton *deleteColumnButton;
+    QSpacerItem *spacerItem;
+    QToolButton *moveColumnUpButton;
+    QToolButton *moveColumnDownButton;
+    QHBoxLayout *horizontalLayout_2;
+    QLabel *label;
+    qdesigner_internal::IconSelector *columnIconSelector;
+    QSpacerItem *spacerItem1;
+    QGroupBox *rowsBox;
+    QGridLayout *gridLayout_3;
+    QListWidget *rowsListWidget;
+    QHBoxLayout *horizontalLayout_4;
+    QToolButton *newRowButton;
+    QToolButton *deleteRowButton;
+    QSpacerItem *spacerItem2;
+    QToolButton *moveRowUpButton;
+    QToolButton *moveRowDownButton;
+    QHBoxLayout *horizontalLayout;
+    QLabel *label_2;
+    qdesigner_internal::IconSelector *rowIconSelector;
+    QSpacerItem *spacerItem3;
+
+    void setupUi(QDialog *qdesigner_internal__TableWidgetEditor)
+    {
+        if (qdesigner_internal__TableWidgetEditor->objectName().isEmpty())
+            qdesigner_internal__TableWidgetEditor->setObjectName(QString::fromUtf8("qdesigner_internal__TableWidgetEditor"));
+        qdesigner_internal__TableWidgetEditor->resize(591, 455);
+        gridLayout_4 = new QGridLayout(qdesigner_internal__TableWidgetEditor);
+        gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4"));
+        itemsBox = new QGroupBox(qdesigner_internal__TableWidgetEditor);
+        itemsBox->setObjectName(QString::fromUtf8("itemsBox"));
+        gridLayout = new QGridLayout(itemsBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        tableWidget = new QTableWidget(itemsBox);
+        tableWidget->setObjectName(QString::fromUtf8("tableWidget"));
+
+        gridLayout->addWidget(tableWidget, 0, 0, 1, 1);
+
+        horizontalLayout_5 = new QHBoxLayout();
+        horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5"));
+        label_3 = new QLabel(itemsBox);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        horizontalLayout_5->addWidget(label_3);
+
+        itemIconSelector = new qdesigner_internal::IconSelector(itemsBox);
+        itemIconSelector->setObjectName(QString::fromUtf8("itemIconSelector"));
+
+        horizontalLayout_5->addWidget(itemIconSelector);
+
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_5->addItem(horizontalSpacer);
+
+
+        gridLayout->addLayout(horizontalLayout_5, 1, 0, 1, 1);
+
+
+        gridLayout_4->addWidget(itemsBox, 0, 0, 1, 1);
+
+        buttonBox = new QDialogButtonBox(qdesigner_internal__TableWidgetEditor);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        gridLayout_4->addWidget(buttonBox, 1, 0, 1, 2);
+
+        widget = new QWidget(qdesigner_internal__TableWidgetEditor);
+        widget->setObjectName(QString::fromUtf8("widget"));
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
+        widget->setSizePolicy(sizePolicy);
+        verticalLayout = new QVBoxLayout(widget);
+        verticalLayout->setMargin(0);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        columnsBox = new QGroupBox(widget);
+        columnsBox->setObjectName(QString::fromUtf8("columnsBox"));
+        gridLayout_2 = new QGridLayout(columnsBox);
+        gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+        columnsListWidget = new QListWidget(columnsBox);
+        columnsListWidget->setObjectName(QString::fromUtf8("columnsListWidget"));
+        QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Expanding);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(columnsListWidget->sizePolicy().hasHeightForWidth());
+        columnsListWidget->setSizePolicy(sizePolicy1);
+        columnsListWidget->setFocusPolicy(Qt::TabFocus);
+
+        gridLayout_2->addWidget(columnsListWidget, 0, 0, 1, 1);
+
+        horizontalLayout_3 = new QHBoxLayout();
+        horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
+        newColumnButton = new QToolButton(columnsBox);
+        newColumnButton->setObjectName(QString::fromUtf8("newColumnButton"));
+
+        horizontalLayout_3->addWidget(newColumnButton);
+
+        deleteColumnButton = new QToolButton(columnsBox);
+        deleteColumnButton->setObjectName(QString::fromUtf8("deleteColumnButton"));
+
+        horizontalLayout_3->addWidget(deleteColumnButton);
+
+        spacerItem = new QSpacerItem(0, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_3->addItem(spacerItem);
+
+        moveColumnUpButton = new QToolButton(columnsBox);
+        moveColumnUpButton->setObjectName(QString::fromUtf8("moveColumnUpButton"));
+
+        horizontalLayout_3->addWidget(moveColumnUpButton);
+
+        moveColumnDownButton = new QToolButton(columnsBox);
+        moveColumnDownButton->setObjectName(QString::fromUtf8("moveColumnDownButton"));
+
+        horizontalLayout_3->addWidget(moveColumnDownButton);
+
+
+        gridLayout_2->addLayout(horizontalLayout_3, 1, 0, 1, 1);
+
+        horizontalLayout_2 = new QHBoxLayout();
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        label = new QLabel(columnsBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        horizontalLayout_2->addWidget(label);
+
+        columnIconSelector = new qdesigner_internal::IconSelector(columnsBox);
+        columnIconSelector->setObjectName(QString::fromUtf8("columnIconSelector"));
+
+        horizontalLayout_2->addWidget(columnIconSelector);
+
+        spacerItem1 = new QSpacerItem(0, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_2->addItem(spacerItem1);
+
+
+        gridLayout_2->addLayout(horizontalLayout_2, 2, 0, 1, 1);
+
+
+        verticalLayout->addWidget(columnsBox);
+
+        rowsBox = new QGroupBox(widget);
+        rowsBox->setObjectName(QString::fromUtf8("rowsBox"));
+        gridLayout_3 = new QGridLayout(rowsBox);
+        gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
+        rowsListWidget = new QListWidget(rowsBox);
+        rowsListWidget->setObjectName(QString::fromUtf8("rowsListWidget"));
+        sizePolicy1.setHeightForWidth(rowsListWidget->sizePolicy().hasHeightForWidth());
+        rowsListWidget->setSizePolicy(sizePolicy1);
+        rowsListWidget->setFocusPolicy(Qt::TabFocus);
+
+        gridLayout_3->addWidget(rowsListWidget, 0, 0, 1, 1);
+
+        horizontalLayout_4 = new QHBoxLayout();
+        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
+        newRowButton = new QToolButton(rowsBox);
+        newRowButton->setObjectName(QString::fromUtf8("newRowButton"));
+
+        horizontalLayout_4->addWidget(newRowButton);
+
+        deleteRowButton = new QToolButton(rowsBox);
+        deleteRowButton->setObjectName(QString::fromUtf8("deleteRowButton"));
+
+        horizontalLayout_4->addWidget(deleteRowButton);
+
+        spacerItem2 = new QSpacerItem(0, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_4->addItem(spacerItem2);
+
+        moveRowUpButton = new QToolButton(rowsBox);
+        moveRowUpButton->setObjectName(QString::fromUtf8("moveRowUpButton"));
+
+        horizontalLayout_4->addWidget(moveRowUpButton);
+
+        moveRowDownButton = new QToolButton(rowsBox);
+        moveRowDownButton->setObjectName(QString::fromUtf8("moveRowDownButton"));
+
+        horizontalLayout_4->addWidget(moveRowDownButton);
+
+
+        gridLayout_3->addLayout(horizontalLayout_4, 1, 0, 1, 1);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        label_2 = new QLabel(rowsBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        horizontalLayout->addWidget(label_2);
+
+        rowIconSelector = new qdesigner_internal::IconSelector(rowsBox);
+        rowIconSelector->setObjectName(QString::fromUtf8("rowIconSelector"));
+
+        horizontalLayout->addWidget(rowIconSelector);
+
+        spacerItem3 = new QSpacerItem(0, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(spacerItem3);
+
+
+        gridLayout_3->addLayout(horizontalLayout, 2, 0, 1, 1);
+
+
+        verticalLayout->addWidget(rowsBox);
+
+
+        gridLayout_4->addWidget(widget, 0, 1, 1, 1);
+
+        itemsBox->raise();
+        buttonBox->raise();
+        widget->raise();
+        QWidget::setTabOrder(tableWidget, columnsListWidget);
+        QWidget::setTabOrder(columnsListWidget, newColumnButton);
+        QWidget::setTabOrder(newColumnButton, deleteColumnButton);
+        QWidget::setTabOrder(deleteColumnButton, moveColumnUpButton);
+        QWidget::setTabOrder(moveColumnUpButton, moveColumnDownButton);
+        QWidget::setTabOrder(moveColumnDownButton, rowsListWidget);
+        QWidget::setTabOrder(rowsListWidget, newRowButton);
+        QWidget::setTabOrder(newRowButton, deleteRowButton);
+        QWidget::setTabOrder(deleteRowButton, moveRowUpButton);
+        QWidget::setTabOrder(moveRowUpButton, moveRowDownButton);
+
+        retranslateUi(qdesigner_internal__TableWidgetEditor);
+        QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__TableWidgetEditor, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__TableWidgetEditor, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__TableWidgetEditor);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__TableWidgetEditor)
+    {
+        qdesigner_internal__TableWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Edit Table Widget", 0, QApplication::UnicodeUTF8));
+        itemsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        tableWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Items", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        label_3->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
+        columnsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Columns", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        columnsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Columns", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Column", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Column", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Column Down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
+        rowsBox->setTitle(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Rows", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        rowsListWidget->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Table Rows", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        newRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New Row", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        deleteRowButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete Row", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        deleteRowButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Delete", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveRowUpButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveRowUpButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "U", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveRowDownButton->setToolTip(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Move Row Down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveRowDownButton->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("qdesigner_internal::TableWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__TableWidgetEditor);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class TableWidgetEditor: public Ui_TableWidgetEditor {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // TABLEWIDGETEDITOR_H
diff --git a/tests/auto/uic/baseline/tetrixwindow.ui b/tests/auto/uic/baseline/tetrixwindow.ui
new file mode 100644
index 0000000..a13f538
--- /dev/null
+++ b/tests/auto/uic/baseline/tetrixwindow.ui
@@ -0,0 +1,164 @@
+<ui version="4.0" >
+ <class>TetrixWindow</class>
+ <widget class="QWidget" name="TetrixWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>537</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Tetrix</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="4" column="0" >
+      <widget class="QPushButton" name="startButton" >
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text" >
+        <string>&amp;Start</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2" >
+      <widget class="QLCDNumber" name="linesLcd" >
+       <property name="segmentStyle" >
+        <enum>QLCDNumber::Filled</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2" >
+      <widget class="QLabel" name="linesRemovedLabel" >
+       <property name="text" >
+        <string>LINES REMOVED</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="2" >
+      <widget class="QPushButton" name="pauseButton" >
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text" >
+        <string>&amp;Pause</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2" >
+      <widget class="QLCDNumber" name="scoreLcd" >
+       <property name="segmentStyle" >
+        <enum>QLCDNumber::Filled</enum>
+       </property>
+      </widget>
+     </item>
+     <item rowspan="6" row="0" column="1" >
+      <widget class="TetrixBoard" name="board" >
+       <property name="focusPolicy" >
+        <enum>Qt::StrongFocus</enum>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::Panel</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Sunken</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="levelLabel" >
+       <property name="text" >
+        <string>LEVEL</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="nextLabel" >
+       <property name="text" >
+        <string>NEXT</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLCDNumber" name="levelLcd" >
+       <property name="segmentStyle" >
+        <enum>QLCDNumber::Filled</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2" >
+      <widget class="QLabel" name="scoreLabel" >
+       <property name="text" >
+        <string>SCORE</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="nextPieceLabel" >
+       <property name="frameShape" >
+        <enum>QFrame::Box</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Raised</enum>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="2" >
+      <widget class="QPushButton" name="quitButton" >
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text" >
+        <string>&amp;Quit</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>TetrixBoard</class>
+   <extends>QFrame</extends>
+   <header>tetrixboard.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/tetrixwindow.ui.h b/tests/auto/uic/baseline/tetrixwindow.ui.h
new file mode 100644
index 0000000..73f1a79
--- /dev/null
+++ b/tests/auto/uic/baseline/tetrixwindow.ui.h
@@ -0,0 +1,174 @@
+/********************************************************************************
+** Form generated from reading ui file 'tetrixwindow.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TETRIXWINDOW_H
+#define TETRIXWINDOW_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLCDNumber>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "tetrixboard.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_TetrixWindow
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGridLayout *gridLayout;
+    QPushButton *startButton;
+    QLCDNumber *linesLcd;
+    QLabel *linesRemovedLabel;
+    QPushButton *pauseButton;
+    QLCDNumber *scoreLcd;
+    TetrixBoard *board;
+    QLabel *levelLabel;
+    QLabel *nextLabel;
+    QLCDNumber *levelLcd;
+    QLabel *scoreLabel;
+    QLabel *nextPieceLabel;
+    QPushButton *quitButton;
+
+    void setupUi(QWidget *TetrixWindow)
+    {
+        if (TetrixWindow->objectName().isEmpty())
+            TetrixWindow->setObjectName(QString::fromUtf8("TetrixWindow"));
+        TetrixWindow->resize(537, 475);
+        vboxLayout = new QVBoxLayout(TetrixWindow);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        gridLayout = new QGridLayout();
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(0);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        startButton = new QPushButton(TetrixWindow);
+        startButton->setObjectName(QString::fromUtf8("startButton"));
+        startButton->setFocusPolicy(Qt::NoFocus);
+
+        gridLayout->addWidget(startButton, 4, 0, 1, 1);
+
+        linesLcd = new QLCDNumber(TetrixWindow);
+        linesLcd->setObjectName(QString::fromUtf8("linesLcd"));
+        linesLcd->setSegmentStyle(QLCDNumber::Filled);
+
+        gridLayout->addWidget(linesLcd, 3, 2, 1, 1);
+
+        linesRemovedLabel = new QLabel(TetrixWindow);
+        linesRemovedLabel->setObjectName(QString::fromUtf8("linesRemovedLabel"));
+        linesRemovedLabel->setAlignment(Qt::AlignBottom|Qt::AlignHCenter);
+
+        gridLayout->addWidget(linesRemovedLabel, 2, 2, 1, 1);
+
+        pauseButton = new QPushButton(TetrixWindow);
+        pauseButton->setObjectName(QString::fromUtf8("pauseButton"));
+        pauseButton->setFocusPolicy(Qt::NoFocus);
+
+        gridLayout->addWidget(pauseButton, 5, 2, 1, 1);
+
+        scoreLcd = new QLCDNumber(TetrixWindow);
+        scoreLcd->setObjectName(QString::fromUtf8("scoreLcd"));
+        scoreLcd->setSegmentStyle(QLCDNumber::Filled);
+
+        gridLayout->addWidget(scoreLcd, 1, 2, 1, 1);
+
+        board = new TetrixBoard(TetrixWindow);
+        board->setObjectName(QString::fromUtf8("board"));
+        board->setFocusPolicy(Qt::StrongFocus);
+        board->setFrameShape(QFrame::Panel);
+        board->setFrameShadow(QFrame::Sunken);
+
+        gridLayout->addWidget(board, 0, 1, 6, 1);
+
+        levelLabel = new QLabel(TetrixWindow);
+        levelLabel->setObjectName(QString::fromUtf8("levelLabel"));
+        levelLabel->setAlignment(Qt::AlignBottom|Qt::AlignHCenter);
+
+        gridLayout->addWidget(levelLabel, 2, 0, 1, 1);
+
+        nextLabel = new QLabel(TetrixWindow);
+        nextLabel->setObjectName(QString::fromUtf8("nextLabel"));
+        nextLabel->setAlignment(Qt::AlignBottom|Qt::AlignHCenter);
+
+        gridLayout->addWidget(nextLabel, 0, 0, 1, 1);
+
+        levelLcd = new QLCDNumber(TetrixWindow);
+        levelLcd->setObjectName(QString::fromUtf8("levelLcd"));
+        levelLcd->setSegmentStyle(QLCDNumber::Filled);
+
+        gridLayout->addWidget(levelLcd, 3, 0, 1, 1);
+
+        scoreLabel = new QLabel(TetrixWindow);
+        scoreLabel->setObjectName(QString::fromUtf8("scoreLabel"));
+        scoreLabel->setAlignment(Qt::AlignBottom|Qt::AlignHCenter);
+
+        gridLayout->addWidget(scoreLabel, 0, 2, 1, 1);
+
+        nextPieceLabel = new QLabel(TetrixWindow);
+        nextPieceLabel->setObjectName(QString::fromUtf8("nextPieceLabel"));
+        nextPieceLabel->setFrameShape(QFrame::Box);
+        nextPieceLabel->setFrameShadow(QFrame::Raised);
+        nextPieceLabel->setAlignment(Qt::AlignCenter);
+
+        gridLayout->addWidget(nextPieceLabel, 1, 0, 1, 1);
+
+        quitButton = new QPushButton(TetrixWindow);
+        quitButton->setObjectName(QString::fromUtf8("quitButton"));
+        quitButton->setFocusPolicy(Qt::NoFocus);
+
+        gridLayout->addWidget(quitButton, 4, 2, 1, 1);
+
+
+        vboxLayout->addLayout(gridLayout);
+
+
+        retranslateUi(TetrixWindow);
+
+        QMetaObject::connectSlotsByName(TetrixWindow);
+    } // setupUi
+
+    void retranslateUi(QWidget *TetrixWindow)
+    {
+        TetrixWindow->setWindowTitle(QApplication::translate("TetrixWindow", "Tetrix", 0, QApplication::UnicodeUTF8));
+        startButton->setText(QApplication::translate("TetrixWindow", "&Start", 0, QApplication::UnicodeUTF8));
+        linesRemovedLabel->setText(QApplication::translate("TetrixWindow", "LINES REMOVED", 0, QApplication::UnicodeUTF8));
+        pauseButton->setText(QApplication::translate("TetrixWindow", "&Pause", 0, QApplication::UnicodeUTF8));
+        levelLabel->setText(QApplication::translate("TetrixWindow", "LEVEL", 0, QApplication::UnicodeUTF8));
+        nextLabel->setText(QApplication::translate("TetrixWindow", "NEXT", 0, QApplication::UnicodeUTF8));
+        scoreLabel->setText(QApplication::translate("TetrixWindow", "SCORE", 0, QApplication::UnicodeUTF8));
+        nextPieceLabel->setText(QString());
+        quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(TetrixWindow);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class TetrixWindow: public Ui_TetrixWindow {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // TETRIXWINDOW_H
diff --git a/tests/auto/uic/baseline/textfinder.ui b/tests/auto/uic/baseline/textfinder.ui
new file mode 100644
index 0000000..af05192
--- /dev/null
+++ b/tests/auto/uic/baseline/textfinder.ui
@@ -0,0 +1,89 @@
+<ui version="4.0" >
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>378</width>
+    <height>158</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Find Text</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="lineEdit" />
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="searchLabel" >
+       <property name="text" >
+        <string>&amp;Keyword:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>lineEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2" >
+      <widget class="QPushButton" name="findButton" >
+       <property name="text" >
+        <string>&amp;Find</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTextEdit" name="textEdit" />
+   </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>lineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>findButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>261</x>
+     <y>17</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>320</x>
+     <y>17</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/textfinder.ui.h b/tests/auto/uic/baseline/textfinder.ui.h
new file mode 100644
index 0000000..afb1bec
--- /dev/null
+++ b/tests/auto/uic/baseline/textfinder.ui.h
@@ -0,0 +1,114 @@
+/********************************************************************************
+** Form generated from reading ui file 'textfinder.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TEXTFINDER_H
+#define TEXTFINDER_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Form
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGridLayout *gridLayout;
+    QLineEdit *lineEdit;
+    QLabel *searchLabel;
+    QPushButton *findButton;
+    QTextEdit *textEdit;
+    QSpacerItem *spacerItem;
+
+    void setupUi(QWidget *Form)
+    {
+        if (Form->objectName().isEmpty())
+            Form->setObjectName(QString::fromUtf8("Form"));
+        Form->resize(378, 158);
+        vboxLayout = new QVBoxLayout(Form);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        gridLayout = new QGridLayout();
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(0);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        lineEdit = new QLineEdit(Form);
+        lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
+
+        gridLayout->addWidget(lineEdit, 0, 1, 1, 1);
+
+        searchLabel = new QLabel(Form);
+        searchLabel->setObjectName(QString::fromUtf8("searchLabel"));
+
+        gridLayout->addWidget(searchLabel, 0, 0, 1, 1);
+
+        findButton = new QPushButton(Form);
+        findButton->setObjectName(QString::fromUtf8("findButton"));
+
+        gridLayout->addWidget(findButton, 0, 2, 1, 1);
+
+
+        vboxLayout->addLayout(gridLayout);
+
+        textEdit = new QTextEdit(Form);
+        textEdit->setObjectName(QString::fromUtf8("textEdit"));
+
+        vboxLayout->addWidget(textEdit);
+
+        spacerItem = new QSpacerItem(20, 16, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(spacerItem);
+
+#ifndef QT_NO_SHORTCUT
+        searchLabel->setBuddy(lineEdit);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(Form);
+        QObject::connect(lineEdit, SIGNAL(returnPressed()), findButton, SLOT(animateClick()));
+
+        QMetaObject::connectSlotsByName(Form);
+    } // setupUi
+
+    void retranslateUi(QWidget *Form)
+    {
+        Form->setWindowTitle(QApplication::translate("Form", "Find Text", 0, QApplication::UnicodeUTF8));
+        searchLabel->setText(QApplication::translate("Form", "&Keyword:", 0, QApplication::UnicodeUTF8));
+        findButton->setText(QApplication::translate("Form", "&Find", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(Form);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class Form: public Ui_Form {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // TEXTFINDER_H
diff --git a/tests/auto/uic/baseline/topicchooser.ui b/tests/auto/uic/baseline/topicchooser.ui
new file mode 100644
index 0000000..d4c90bb
--- /dev/null
+++ b/tests/auto/uic/baseline/topicchooser.ui
@@ -0,0 +1,116 @@
+<UI version="4.0" stdsetdef="1" >
+ <class>TopicChooser</class> 
+ <widget class="QDialog" name="TopicChooser" >
+  <property name="objectName" >
+   <string notr="true">TopicChooser</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>391</width>
+    <height>223</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Choose Topic</string>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>  
+  <layout class="QVBoxLayout" >
+   <property name="objectName" >
+    <string notr="true">unnamed</string>
+   </property>
+   <property name="margin" >
+    <number>11</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label" >
+     <property name="objectName" >
+      <string notr="true">label</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Topics</string>
+     </property>
+     <property name="buddy" stdset="0" >
+      <cstring>listWidget</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="listWidget" >
+     <property name="objectName" >
+      <string notr="true">listWidget</string>
+     </property>     
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="Layout16" >
+     <property name="objectName" >
+      <string notr="true">Layout16</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="objectName" >
+       <string notr="true">unnamed</string>
+      </property>
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <spacer name="Horizontal Spacing2" >
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+        <property name="sizeType" >
+         <enum>Expanding</enum>
+        </property>
+        <property name="orientation" >
+         <enum>Horizontal</enum>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonDisplay" >
+        <property name="objectName" >
+         <string notr="true">buttonDisplay</string>
+        </property>
+        <property name="text" >
+         <string>&amp;Display</string>
+        </property>
+        <property name="autoDefault" >
+         <bool>true</bool>
+        </property>
+        <property name="default" >
+         <bool>true</bool>
+        </property>        
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonCancel" >
+        <property name="objectName" >
+         <string notr="true">buttonCancel</string>
+        </property>
+        <property name="text" >
+         <string>&amp;Close</string>
+        </property>
+        <property name="autoDefault" >
+         <bool>true</bool>
+        </property>        
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+</UI>
diff --git a/tests/auto/uic/baseline/topicchooser.ui.h b/tests/auto/uic/baseline/topicchooser.ui.h
new file mode 100644
index 0000000..810f11a
--- /dev/null
+++ b/tests/auto/uic/baseline/topicchooser.ui.h
@@ -0,0 +1,120 @@
+/********************************************************************************
+** Form generated from reading ui file 'topicchooser.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TOPICCHOOSER_H
+#define TOPICCHOOSER_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListWidget>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_TopicChooser
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QLabel *label;
+    QListWidget *listWidget;
+    QWidget *Layout16;
+    QHBoxLayout *hboxLayout;
+    QSpacerItem *Horizontal_Spacing2;
+    QPushButton *buttonDisplay;
+    QPushButton *buttonCancel;
+
+    void setupUi(QDialog *TopicChooser)
+    {
+        if (TopicChooser->objectName().isEmpty())
+            TopicChooser->setObjectName(QString::fromUtf8("TopicChooser"));
+        TopicChooser->resize(391, 223);
+        TopicChooser->setSizeGripEnabled(true);
+        vboxLayout = new QVBoxLayout(TopicChooser);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setMargin(11);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("unnamed"));
+        label = new QLabel(TopicChooser);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        vboxLayout->addWidget(label);
+
+        listWidget = new QListWidget(TopicChooser);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+
+        vboxLayout->addWidget(listWidget);
+
+        Layout16 = new QWidget(TopicChooser);
+        Layout16->setObjectName(QString::fromUtf8("Layout16"));
+        hboxLayout = new QHBoxLayout(Layout16);
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+        hboxLayout->setMargin(0);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
+        Horizontal_Spacing2 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(Horizontal_Spacing2);
+
+        buttonDisplay = new QPushButton(Layout16);
+        buttonDisplay->setObjectName(QString::fromUtf8("buttonDisplay"));
+        buttonDisplay->setAutoDefault(true);
+        buttonDisplay->setDefault(true);
+
+        hboxLayout->addWidget(buttonDisplay);
+
+        buttonCancel = new QPushButton(Layout16);
+        buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+        buttonCancel->setAutoDefault(true);
+
+        hboxLayout->addWidget(buttonCancel);
+
+
+        vboxLayout->addWidget(Layout16);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(listWidget);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(TopicChooser);
+
+        QMetaObject::connectSlotsByName(TopicChooser);
+    } // setupUi
+
+    void retranslateUi(QDialog *TopicChooser)
+    {
+        TopicChooser->setWindowTitle(QApplication::translate("TopicChooser", "Choose Topic", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("TopicChooser", "&Topics", 0, QApplication::UnicodeUTF8));
+        buttonDisplay->setText(QApplication::translate("TopicChooser", "&Display", 0, QApplication::UnicodeUTF8));
+        buttonCancel->setText(QApplication::translate("TopicChooser", "&Close", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(TopicChooser);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class TopicChooser: public Ui_TopicChooser {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // TOPICCHOOSER_H
diff --git a/tests/auto/uic/baseline/translatedialog.ui b/tests/auto/uic/baseline/translatedialog.ui
new file mode 100644
index 0000000..0418bac
--- /dev/null
+++ b/tests/auto/uic/baseline/translatedialog.ui
@@ -0,0 +1,300 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>TranslateDialog</class>
+ <widget class="QDialog" name="TranslateDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>407</width>
+    <height>145</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt Linguist</string>
+  </property>
+  <property name="whatsThis" >
+   <string>This window allows you to search for some text in the translation source file.</string>
+  </property>
+  <layout class="QHBoxLayout" >
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <property name="leftMargin" >
+    <number>9</number>
+   </property>
+   <property name="topMargin" >
+    <number>9</number>
+   </property>
+   <property name="rightMargin" >
+    <number>9</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <layout class="QGridLayout" >
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>0</number>
+       </property>
+       <property name="horizontalSpacing" >
+        <number>6</number>
+       </property>
+       <property name="verticalSpacing" >
+        <number>6</number>
+       </property>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="ledTranslateTo" >
+         <property name="whatsThis" >
+          <string>Type in the text to search for.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="findWhat" >
+         <property name="text" >
+          <string>Find &amp;source text:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>ledFindWhat</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="translateTo" >
+         <property name="text" >
+          <string>&amp;Translate to:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>ledTranslateTo</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="ledFindWhat" >
+         <property name="whatsThis" >
+          <string>Type in the text to search for.</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox" >
+       <property name="title" >
+        <string>Search options</string>
+       </property>
+       <layout class="QVBoxLayout" >
+        <item>
+         <widget class="QCheckBox" name="ckMatchCase" >
+          <property name="whatsThis" >
+           <string>Texts such as 'TeX' and 'tex' are considered as different when checked.</string>
+          </property>
+          <property name="text" >
+           <string>Match &amp;case</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="ckMarkFinished" >
+          <property name="text" >
+           <string>Mark new translation as &amp;finished</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="findNxt" >
+       <property name="whatsThis" >
+        <string>Click here to find the next occurrence of the text you typed in.</string>
+       </property>
+       <property name="text" >
+        <string>Find Next</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+       <property name="flat" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="translate" >
+       <property name="text" >
+        <string>Translate</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="translateAll" >
+       <property name="text" >
+        <string>Translate All</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancel" >
+       <property name="whatsThis" >
+        <string>Click here to close this window.</string>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>51</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <tabstops>
+  <tabstop>ledFindWhat</tabstop>
+  <tabstop>ledTranslateTo</tabstop>
+  <tabstop>findNxt</tabstop>
+  <tabstop>translate</tabstop>
+  <tabstop>translateAll</tabstop>
+  <tabstop>cancel</tabstop>
+  <tabstop>ckMatchCase</tabstop>
+  <tabstop>ckMarkFinished</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>cancel</sender>
+   <signal>clicked()</signal>
+   <receiver>TranslateDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>397</x>
+     <y>157</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>373</x>
+     <y>109</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/uic/baseline/translatedialog.ui.h
new file mode 100644
index 0000000..ec4a0f4
--- /dev/null
+++ b/tests/auto/uic/baseline/translatedialog.ui.h
@@ -0,0 +1,261 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'translatedialog.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TRANSLATEDIALOG_H
+#define TRANSLATEDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_TranslateDialog
+{
+public:
+    QHBoxLayout *hboxLayout;
+    QVBoxLayout *vboxLayout;
+    QGridLayout *gridLayout;
+    QLineEdit *ledTranslateTo;
+    QLabel *findWhat;
+    QLabel *translateTo;
+    QLineEdit *ledFindWhat;
+    QGroupBox *groupBox;
+    QVBoxLayout *vboxLayout1;
+    QCheckBox *ckMatchCase;
+    QCheckBox *ckMarkFinished;
+    QSpacerItem *spacerItem;
+    QVBoxLayout *vboxLayout2;
+    QPushButton *findNxt;
+    QPushButton *translate;
+    QPushButton *translateAll;
+    QPushButton *cancel;
+    QSpacerItem *spacerItem1;
+
+    void setupUi(QDialog *TranslateDialog)
+    {
+        if (TranslateDialog->objectName().isEmpty())
+            TranslateDialog->setObjectName(QString::fromUtf8("TranslateDialog"));
+        TranslateDialog->resize(407, 145);
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(TranslateDialog->sizePolicy().hasHeightForWidth());
+        TranslateDialog->setSizePolicy(sizePolicy);
+        hboxLayout = new QHBoxLayout(TranslateDialog);
+        hboxLayout->setSpacing(6);
+        hboxLayout->setMargin(11);
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setContentsMargins(9, 9, 9, 9);
+        vboxLayout = new QVBoxLayout();
+        vboxLayout->setSpacing(6);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
+        gridLayout = new QGridLayout();
+        gridLayout->setSpacing(6);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setHorizontalSpacing(6);
+        gridLayout->setVerticalSpacing(6);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
+        ledTranslateTo = new QLineEdit(TranslateDialog);
+        ledTranslateTo->setObjectName(QString::fromUtf8("ledTranslateTo"));
+
+        gridLayout->addWidget(ledTranslateTo, 1, 1, 1, 1);
+
+        findWhat = new QLabel(TranslateDialog);
+        findWhat->setObjectName(QString::fromUtf8("findWhat"));
+
+        gridLayout->addWidget(findWhat, 0, 0, 1, 1);
+
+        translateTo = new QLabel(TranslateDialog);
+        translateTo->setObjectName(QString::fromUtf8("translateTo"));
+
+        gridLayout->addWidget(translateTo, 1, 0, 1, 1);
+
+        ledFindWhat = new QLineEdit(TranslateDialog);
+        ledFindWhat->setObjectName(QString::fromUtf8("ledFindWhat"));
+
+        gridLayout->addWidget(ledFindWhat, 0, 1, 1, 1);
+
+
+        vboxLayout->addLayout(gridLayout);
+
+        groupBox = new QGroupBox(TranslateDialog);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        vboxLayout1 = new QVBoxLayout(groupBox);
+        vboxLayout1->setSpacing(6);
+        vboxLayout1->setMargin(11);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        ckMatchCase = new QCheckBox(groupBox);
+        ckMatchCase->setObjectName(QString::fromUtf8("ckMatchCase"));
+
+        vboxLayout1->addWidget(ckMatchCase);
+
+        ckMarkFinished = new QCheckBox(groupBox);
+        ckMarkFinished->setObjectName(QString::fromUtf8("ckMarkFinished"));
+
+        vboxLayout1->addWidget(ckMarkFinished);
+
+        spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout1->addItem(spacerItem);
+
+
+        vboxLayout->addWidget(groupBox);
+
+
+        hboxLayout->addLayout(vboxLayout);
+
+        vboxLayout2 = new QVBoxLayout();
+        vboxLayout2->setSpacing(6);
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
+        findNxt = new QPushButton(TranslateDialog);
+        findNxt->setObjectName(QString::fromUtf8("findNxt"));
+        findNxt->setDefault(true);
+        findNxt->setFlat(false);
+
+        vboxLayout2->addWidget(findNxt);
+
+        translate = new QPushButton(TranslateDialog);
+        translate->setObjectName(QString::fromUtf8("translate"));
+
+        vboxLayout2->addWidget(translate);
+
+        translateAll = new QPushButton(TranslateDialog);
+        translateAll->setObjectName(QString::fromUtf8("translateAll"));
+
+        vboxLayout2->addWidget(translateAll);
+
+        cancel = new QPushButton(TranslateDialog);
+        cancel->setObjectName(QString::fromUtf8("cancel"));
+
+        vboxLayout2->addWidget(cancel);
+
+        spacerItem1 = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout2->addItem(spacerItem1);
+
+
+        hboxLayout->addLayout(vboxLayout2);
+
+#ifndef QT_NO_SHORTCUT
+        findWhat->setBuddy(ledFindWhat);
+        translateTo->setBuddy(ledTranslateTo);
+#endif // QT_NO_SHORTCUT
+        QWidget::setTabOrder(ledFindWhat, ledTranslateTo);
+        QWidget::setTabOrder(ledTranslateTo, findNxt);
+        QWidget::setTabOrder(findNxt, translate);
+        QWidget::setTabOrder(translate, translateAll);
+        QWidget::setTabOrder(translateAll, cancel);
+        QWidget::setTabOrder(cancel, ckMatchCase);
+        QWidget::setTabOrder(ckMatchCase, ckMarkFinished);
+
+        retranslateUi(TranslateDialog);
+        QObject::connect(cancel, SIGNAL(clicked()), TranslateDialog, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(TranslateDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *TranslateDialog)
+    {
+        TranslateDialog->setWindowTitle(QApplication::translate("TranslateDialog", "Qt Linguist", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        TranslateDialog->setWhatsThis(QApplication::translate("TranslateDialog", "This window allows you to search for some text in the translation source file.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+#ifndef QT_NO_WHATSTHIS
+        ledTranslateTo->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        findWhat->setText(QApplication::translate("TranslateDialog", "Find &source text:", 0, QApplication::UnicodeUTF8));
+        translateTo->setText(QApplication::translate("TranslateDialog", "&Translate to:", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        ledFindWhat->setWhatsThis(QApplication::translate("TranslateDialog", "Type in the text to search for.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        groupBox->setTitle(QApplication::translate("TranslateDialog", "Search options", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        ckMatchCase->setWhatsThis(QApplication::translate("TranslateDialog", "Texts such as 'TeX' and 'tex' are considered as different when checked.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        ckMatchCase->setText(QApplication::translate("TranslateDialog", "Match &case", 0, QApplication::UnicodeUTF8));
+        ckMarkFinished->setText(QApplication::translate("TranslateDialog", "Mark new translation as &finished", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        findNxt->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to find the next occurrence of the text you typed in.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        findNxt->setText(QApplication::translate("TranslateDialog", "Find Next", 0, QApplication::UnicodeUTF8));
+        translate->setText(QApplication::translate("TranslateDialog", "Translate", 0, QApplication::UnicodeUTF8));
+        translateAll->setText(QApplication::translate("TranslateDialog", "Translate All", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_WHATSTHIS
+        cancel->setWhatsThis(QApplication::translate("TranslateDialog", "Click here to close this window.", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_WHATSTHIS
+        cancel->setText(QApplication::translate("TranslateDialog", "Cancel", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(TranslateDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class TranslateDialog: public Ui_TranslateDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // TRANSLATEDIALOG_H
diff --git a/tests/auto/uic/baseline/translationsettings.ui b/tests/auto/uic/baseline/translationsettings.ui
new file mode 100644
index 0000000..4bd4be9
--- /dev/null
+++ b/tests/auto/uic/baseline/translationsettings.ui
@@ -0,0 +1,107 @@
+<ui version="4.0" >
+ <class>TranslationSettings</class>
+ <widget class="QDialog" name="TranslationSettings" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>346</width>
+    <height>125</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt Linguist - Translation file settings</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Target language</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="cbLanguageList" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Language</string>
+        </property>
+        <property name="buddy" >
+         <cstring>cbLanguageList</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QComboBox" name="cbCountryList" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="lblCountry" >
+        <property name="text" >
+         <string>Country/Region</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>TranslationSettings</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>244</x>
+     <y>224</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>242</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>TranslationSettings</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>312</x>
+     <y>230</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>242</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/translationsettings.ui.h b/tests/auto/uic/baseline/translationsettings.ui.h
new file mode 100644
index 0000000..792b733
--- /dev/null
+++ b/tests/auto/uic/baseline/translationsettings.ui.h
@@ -0,0 +1,121 @@
+/********************************************************************************
+** Form generated from reading ui file 'translationsettings.ui'
+**
+** Created: Mon Sep 1 09:31:03 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TRANSLATIONSETTINGS_H
+#define TRANSLATIONSETTINGS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QVBoxLayout>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_TranslationSettings
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGroupBox *groupBox;
+    QGridLayout *gridLayout;
+    QComboBox *cbLanguageList;
+    QLabel *label;
+    QComboBox *cbCountryList;
+    QLabel *lblCountry;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *TranslationSettings)
+    {
+        if (TranslationSettings->objectName().isEmpty())
+            TranslationSettings->setObjectName(QString::fromUtf8("TranslationSettings"));
+        TranslationSettings->resize(346, 125);
+        vboxLayout = new QVBoxLayout(TranslationSettings);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        groupBox = new QGroupBox(TranslationSettings);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        gridLayout = new QGridLayout(groupBox);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        cbLanguageList = new QComboBox(groupBox);
+        cbLanguageList->setObjectName(QString::fromUtf8("cbLanguageList"));
+
+        gridLayout->addWidget(cbLanguageList, 0, 1, 1, 1);
+
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        cbCountryList = new QComboBox(groupBox);
+        cbCountryList->setObjectName(QString::fromUtf8("cbCountryList"));
+
+        gridLayout->addWidget(cbCountryList, 1, 1, 1, 1);
+
+        lblCountry = new QLabel(groupBox);
+        lblCountry->setObjectName(QString::fromUtf8("lblCountry"));
+
+        gridLayout->addWidget(lblCountry, 1, 0, 1, 1);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        buttonBox = new QDialogButtonBox(TranslationSettings);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+#ifndef QT_NO_SHORTCUT
+        label->setBuddy(cbLanguageList);
+#endif // QT_NO_SHORTCUT
+
+        retranslateUi(TranslationSettings);
+        QObject::connect(buttonBox, SIGNAL(accepted()), TranslationSettings, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), TranslationSettings, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(TranslationSettings);
+    } // setupUi
+
+    void retranslateUi(QDialog *TranslationSettings)
+    {
+        TranslationSettings->setWindowTitle(QApplication::translate("TranslationSettings", "Qt Linguist - Translation file settings", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("TranslationSettings", "Target language", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("TranslationSettings", "Language", 0, QApplication::UnicodeUTF8));
+        lblCountry->setText(QApplication::translate("TranslationSettings", "Country/Region", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(TranslationSettings);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class TranslationSettings: public Ui_TranslationSettings {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // TRANSLATIONSETTINGS_H
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui b/tests/auto/uic/baseline/treewidgeteditor.ui
new file mode 100644
index 0000000..64190ad
--- /dev/null
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui
@@ -0,0 +1,378 @@
+<ui version="4.0" >
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <class>qdesigner_internal::TreeWidgetEditor</class>
+ <widget class="QDialog" name="qdesigner_internal::TreeWidgetEditor" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>619</width>
+    <height>321</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Edit Tree Widget</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="itemsBox" >
+     <property name="title" >
+      <string>Tree Items</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QTreeWidget" name="treeWidget" >
+        <property name="focusPolicy" >
+         <enum>Qt::TabFocus</enum>
+        </property>
+        <property name="toolTip" >
+         <string>Tree Items</string>
+        </property>
+        <column>
+         <property name="text" >
+          <string>1</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout_4" >
+        <item>
+         <widget class="QToolButton" name="newItemButton" >
+          <property name="toolTip" >
+           <string>New Item</string>
+          </property>
+          <property name="text" >
+           <string>&amp;New</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="newSubItemButton" >
+          <property name="toolTip" >
+           <string>New Subitem</string>
+          </property>
+          <property name="text" >
+           <string>New &amp;Subitem</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="deleteItemButton" >
+          <property name="toolTip" >
+           <string>Delete Item</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Delete</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>28</width>
+            <height>23</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveItemLeftButton" >
+          <property name="toolTip" >
+           <string>Move Item Left (before Parent Item)</string>
+          </property>
+          <property name="text" >
+           <string>L</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveItemRightButton" >
+          <property name="toolTip" >
+           <string>Move Item Right (as a First Subitem of the Next Sibling Item)</string>
+          </property>
+          <property name="text" >
+           <string>R</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveItemUpButton" >
+          <property name="toolTip" >
+           <string>Move Item Up</string>
+          </property>
+          <property name="text" >
+           <string>U</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveItemDownButton" >
+          <property name="toolTip" >
+           <string>Move Item Down</string>
+          </property>
+          <property name="text" >
+           <string>D</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout_2" >
+        <item>
+         <widget class="QLabel" name="label_2" >
+          <property name="text" >
+           <string>Icon</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="qdesigner_internal::IconSelector" native="1" name="itemIconSelector" />
+        </item>
+        <item>
+         <spacer name="horizontalSpacer" >
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>288</width>
+            <height>21</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QGroupBox" name="columnsBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Columns</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2" >
+      <item row="0" column="0" >
+       <widget class="QListWidget" name="listWidget" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Expanding" hsizetype="Ignored" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::TabFocus</enum>
+        </property>
+        <property name="toolTip" >
+         <string>Tree Columns</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout_3" >
+        <item>
+         <widget class="QToolButton" name="newColumnButton" >
+          <property name="toolTip" >
+           <string>New Column</string>
+          </property>
+          <property name="text" >
+           <string>New</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="deleteColumnButton" >
+          <property name="toolTip" >
+           <string>Delete Column</string>
+          </property>
+          <property name="text" >
+           <string>Delete</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>13</width>
+            <height>23</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveColumnUpButton" >
+          <property name="toolTip" >
+           <string>Move Column Up</string>
+          </property>
+          <property name="text" >
+           <string>U</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="moveColumnDownButton" >
+          <property name="toolTip" >
+           <string>Move Column Down</string>
+          </property>
+          <property name="text" >
+           <string>D</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>Icon</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="qdesigner_internal::IconSelector" native="1" name="columnIconSelector" />
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>0</width>
+            <height>10</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qdesigner_internal::IconSelector</class>
+   <extends>QWidget</extends>
+   <header>iconselector_p.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>treeWidget</tabstop>
+  <tabstop>newItemButton</tabstop>
+  <tabstop>newSubItemButton</tabstop>
+  <tabstop>deleteItemButton</tabstop>
+  <tabstop>moveItemLeftButton</tabstop>
+  <tabstop>moveItemRightButton</tabstop>
+  <tabstop>moveItemUpButton</tabstop>
+  <tabstop>moveItemDownButton</tabstop>
+  <tabstop>listWidget</tabstop>
+  <tabstop>newColumnButton</tabstop>
+  <tabstop>deleteColumnButton</tabstop>
+  <tabstop>moveColumnUpButton</tabstop>
+  <tabstop>moveColumnDownButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qdesigner_internal::TreeWidgetEditor</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>450</x>
+     <y>259</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>292</x>
+     <y>272</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qdesigner_internal::TreeWidgetEditor</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>539</x>
+     <y>266</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>556</x>
+     <y>275</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui.h b/tests/auto/uic/baseline/treewidgeteditor.ui.h
new file mode 100644
index 0000000..eb4875d
--- /dev/null
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui.h
@@ -0,0 +1,366 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'treewidgeteditor.ui'
+**
+** Created: Mon Jun 16 17:47:26 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TREEWIDGETEDITOR_H
+#define TREEWIDGETEDITOR_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QListWidget>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QTreeWidget>
+#include "iconselector_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
+class Ui_TreeWidgetEditor
+{
+public:
+    QGridLayout *gridLayout_3;
+    QGroupBox *itemsBox;
+    QGridLayout *gridLayout;
+    QTreeWidget *treeWidget;
+    QHBoxLayout *horizontalLayout_4;
+    QToolButton *newItemButton;
+    QToolButton *newSubItemButton;
+    QToolButton *deleteItemButton;
+    QSpacerItem *spacerItem;
+    QToolButton *moveItemLeftButton;
+    QToolButton *moveItemRightButton;
+    QToolButton *moveItemUpButton;
+    QToolButton *moveItemDownButton;
+    QHBoxLayout *horizontalLayout_2;
+    QLabel *label_2;
+    qdesigner_internal::IconSelector *itemIconSelector;
+    QSpacerItem *horizontalSpacer;
+    QGroupBox *columnsBox;
+    QGridLayout *gridLayout_2;
+    QListWidget *listWidget;
+    QHBoxLayout *horizontalLayout_3;
+    QToolButton *newColumnButton;
+    QToolButton *deleteColumnButton;
+    QSpacerItem *spacerItem1;
+    QToolButton *moveColumnUpButton;
+    QToolButton *moveColumnDownButton;
+    QHBoxLayout *horizontalLayout;
+    QLabel *label;
+    qdesigner_internal::IconSelector *columnIconSelector;
+    QSpacerItem *spacerItem2;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *qdesigner_internal__TreeWidgetEditor)
+    {
+        if (qdesigner_internal__TreeWidgetEditor->objectName().isEmpty())
+            qdesigner_internal__TreeWidgetEditor->setObjectName(QString::fromUtf8("qdesigner_internal__TreeWidgetEditor"));
+        qdesigner_internal__TreeWidgetEditor->resize(619, 321);
+        gridLayout_3 = new QGridLayout(qdesigner_internal__TreeWidgetEditor);
+        gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
+        itemsBox = new QGroupBox(qdesigner_internal__TreeWidgetEditor);
+        itemsBox->setObjectName(QString::fromUtf8("itemsBox"));
+        gridLayout = new QGridLayout(itemsBox);
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        treeWidget = new QTreeWidget(itemsBox);
+        treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
+        treeWidget->setFocusPolicy(Qt::TabFocus);
+
+        gridLayout->addWidget(treeWidget, 0, 0, 1, 1);
+
+        horizontalLayout_4 = new QHBoxLayout();
+        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
+        newItemButton = new QToolButton(itemsBox);
+        newItemButton->setObjectName(QString::fromUtf8("newItemButton"));
+
+        horizontalLayout_4->addWidget(newItemButton);
+
+        newSubItemButton = new QToolButton(itemsBox);
+        newSubItemButton->setObjectName(QString::fromUtf8("newSubItemButton"));
+
+        horizontalLayout_4->addWidget(newSubItemButton);
+
+        deleteItemButton = new QToolButton(itemsBox);
+        deleteItemButton->setObjectName(QString::fromUtf8("deleteItemButton"));
+
+        horizontalLayout_4->addWidget(deleteItemButton);
+
+        spacerItem = new QSpacerItem(28, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_4->addItem(spacerItem);
+
+        moveItemLeftButton = new QToolButton(itemsBox);
+        moveItemLeftButton->setObjectName(QString::fromUtf8("moveItemLeftButton"));
+
+        horizontalLayout_4->addWidget(moveItemLeftButton);
+
+        moveItemRightButton = new QToolButton(itemsBox);
+        moveItemRightButton->setObjectName(QString::fromUtf8("moveItemRightButton"));
+
+        horizontalLayout_4->addWidget(moveItemRightButton);
+
+        moveItemUpButton = new QToolButton(itemsBox);
+        moveItemUpButton->setObjectName(QString::fromUtf8("moveItemUpButton"));
+
+        horizontalLayout_4->addWidget(moveItemUpButton);
+
+        moveItemDownButton = new QToolButton(itemsBox);
+        moveItemDownButton->setObjectName(QString::fromUtf8("moveItemDownButton"));
+
+        horizontalLayout_4->addWidget(moveItemDownButton);
+
+
+        gridLayout->addLayout(horizontalLayout_4, 1, 0, 1, 1);
+
+        horizontalLayout_2 = new QHBoxLayout();
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        label_2 = new QLabel(itemsBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        horizontalLayout_2->addWidget(label_2);
+
+        itemIconSelector = new qdesigner_internal::IconSelector(itemsBox);
+        itemIconSelector->setObjectName(QString::fromUtf8("itemIconSelector"));
+
+        horizontalLayout_2->addWidget(itemIconSelector);
+
+        horizontalSpacer = new QSpacerItem(288, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_2->addItem(horizontalSpacer);
+
+
+        gridLayout->addLayout(horizontalLayout_2, 2, 0, 1, 1);
+
+
+        gridLayout_3->addWidget(itemsBox, 0, 0, 1, 1);
+
+        columnsBox = new QGroupBox(qdesigner_internal__TreeWidgetEditor);
+        columnsBox->setObjectName(QString::fromUtf8("columnsBox"));
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(columnsBox->sizePolicy().hasHeightForWidth());
+        columnsBox->setSizePolicy(sizePolicy);
+        gridLayout_2 = new QGridLayout(columnsBox);
+        gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+        listWidget = new QListWidget(columnsBox);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+        QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Expanding);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(listWidget->sizePolicy().hasHeightForWidth());
+        listWidget->setSizePolicy(sizePolicy1);
+        listWidget->setFocusPolicy(Qt::TabFocus);
+
+        gridLayout_2->addWidget(listWidget, 0, 0, 1, 1);
+
+        horizontalLayout_3 = new QHBoxLayout();
+        horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
+        newColumnButton = new QToolButton(columnsBox);
+        newColumnButton->setObjectName(QString::fromUtf8("newColumnButton"));
+
+        horizontalLayout_3->addWidget(newColumnButton);
+
+        deleteColumnButton = new QToolButton(columnsBox);
+        deleteColumnButton->setObjectName(QString::fromUtf8("deleteColumnButton"));
+
+        horizontalLayout_3->addWidget(deleteColumnButton);
+
+        spacerItem1 = new QSpacerItem(13, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_3->addItem(spacerItem1);
+
+        moveColumnUpButton = new QToolButton(columnsBox);
+        moveColumnUpButton->setObjectName(QString::fromUtf8("moveColumnUpButton"));
+
+        horizontalLayout_3->addWidget(moveColumnUpButton);
+
+        moveColumnDownButton = new QToolButton(columnsBox);
+        moveColumnDownButton->setObjectName(QString::fromUtf8("moveColumnDownButton"));
+
+        horizontalLayout_3->addWidget(moveColumnDownButton);
+
+
+        gridLayout_2->addLayout(horizontalLayout_3, 1, 0, 1, 1);
+
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        label = new QLabel(columnsBox);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        horizontalLayout->addWidget(label);
+
+        columnIconSelector = new qdesigner_internal::IconSelector(columnsBox);
+        columnIconSelector->setObjectName(QString::fromUtf8("columnIconSelector"));
+
+        horizontalLayout->addWidget(columnIconSelector);
+
+        spacerItem2 = new QSpacerItem(0, 10, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(spacerItem2);
+
+
+        gridLayout_2->addLayout(horizontalLayout, 2, 0, 1, 1);
+
+
+        gridLayout_3->addWidget(columnsBox, 0, 1, 1, 1);
+
+        buttonBox = new QDialogButtonBox(qdesigner_internal__TreeWidgetEditor);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+        gridLayout_3->addWidget(buttonBox, 1, 0, 1, 2);
+
+        QWidget::setTabOrder(treeWidget, newItemButton);
+        QWidget::setTabOrder(newItemButton, newSubItemButton);
+        QWidget::setTabOrder(newSubItemButton, deleteItemButton);
+        QWidget::setTabOrder(deleteItemButton, moveItemLeftButton);
+        QWidget::setTabOrder(moveItemLeftButton, moveItemRightButton);
+        QWidget::setTabOrder(moveItemRightButton, moveItemUpButton);
+        QWidget::setTabOrder(moveItemUpButton, moveItemDownButton);
+        QWidget::setTabOrder(moveItemDownButton, listWidget);
+        QWidget::setTabOrder(listWidget, newColumnButton);
+        QWidget::setTabOrder(newColumnButton, deleteColumnButton);
+        QWidget::setTabOrder(deleteColumnButton, moveColumnUpButton);
+        QWidget::setTabOrder(moveColumnUpButton, moveColumnDownButton);
+
+        retranslateUi(qdesigner_internal__TreeWidgetEditor);
+        QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__TreeWidgetEditor, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__TreeWidgetEditor, SLOT(reject()));
+
+        QMetaObject::connectSlotsByName(qdesigner_internal__TreeWidgetEditor);
+    } // setupUi
+
+    void retranslateUi(QDialog *qdesigner_internal__TreeWidgetEditor)
+    {
+        qdesigner_internal__TreeWidgetEditor->setWindowTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Edit Tree Widget", 0, QApplication::UnicodeUTF8));
+        itemsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
+        ___qtreewidgetitem->setText(0, QApplication::translate("qdesigner_internal::TreeWidgetEditor", "1", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        treeWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Items", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        newItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Item", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        newSubItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Subitem", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newSubItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New &Subitem", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        deleteItemButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Item", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        deleteItemButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "&Delete", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveItemLeftButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Left (before Parent Item)", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveItemLeftButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "L", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveItemRightButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Right (as a First Subitem of the Next Sibling Item)", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveItemRightButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "R", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveItemUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveItemUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveItemDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Item Down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveItemDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
+        columnsBox->setTitle(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Columns", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        listWidget->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Tree Columns", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
+        newColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New Column", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        newColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "New", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        deleteColumnButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete Column", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        deleteColumnButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Delete", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveColumnUpButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Up", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveColumnUpButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "U", 0, QApplication::UnicodeUTF8));
+#ifndef QT_NO_TOOLTIP
+        moveColumnDownButton->setToolTip(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Move Column Down", 0, QApplication::UnicodeUTF8));
+#endif // QT_NO_TOOLTIP
+        moveColumnDownButton->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "D", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("qdesigner_internal::TreeWidgetEditor", "Icon", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(qdesigner_internal__TreeWidgetEditor);
+    } // retranslateUi
+
+};
+
+} // namespace qdesigner_internal
+
+namespace qdesigner_internal {
+namespace Ui {
+    class TreeWidgetEditor: public Ui_TreeWidgetEditor {};
+} // namespace Ui
+} // namespace qdesigner_internal
+
+QT_END_NAMESPACE
+
+#endif // TREEWIDGETEDITOR_H
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui b/tests/auto/uic/baseline/trpreviewtool.ui
new file mode 100644
index 0000000..a9da3b2
--- /dev/null
+++ b/tests/auto/uic/baseline/trpreviewtool.ui
@@ -0,0 +1,188 @@
+<ui version="4.0" >
+ <author></author>
+ <comment>*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************</comment>
+ <exportmacro></exportmacro>
+ <class>TrPreviewToolClass</class>
+ <widget class="QMainWindow" name="TrPreviewToolClass" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>593</width>
+    <height>466</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt Translation Preview Tool</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" />
+  <widget class="QMenuBar" name="menuBar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>593</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuView" >
+    <property name="title" >
+     <string>&amp;View</string>
+    </property>
+    <widget class="QMenu" name="menuViewViews" >
+     <property name="title" >
+      <string>&amp;Views</string>
+     </property>
+    </widget>
+    <addaction name="menuViewViews" />
+   </widget>
+   <widget class="QMenu" name="menuHelp" >
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionAbout" />
+    <addaction name="actionAbout_Qt" />
+   </widget>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionOpenForm" />
+    <addaction name="actionLoadTranslation" />
+    <addaction name="actionReloadTranslations" />
+    <addaction name="separator" />
+    <addaction name="actionClose" />
+   </widget>
+   <addaction name="menuFile" />
+   <addaction name="menuView" />
+   <addaction name="menuHelp" />
+  </widget>
+  <widget class="QToolBar" name="mainToolBar" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="actionOpenForm" />
+   <addaction name="actionLoadTranslation" />
+   <addaction name="actionReloadTranslations" />
+  </widget>
+  <widget class="QStatusBar" name="statusBar" />
+  <widget class="QDockWidget" name="dwForms" >
+   <property name="windowTitle" >
+    <string>Forms</string>
+   </property>
+   <attribute name="dockWidgetArea" >
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents" >
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QListView" name="viewForms" >
+       <property name="editTriggers" >
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="alternatingRowColors" >
+        <bool>true</bool>
+       </property>
+       <property name="uniformItemSizes" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <action name="actionOpenForm" >
+   <property name="icon" >
+    <iconset resource="qttrpreviewtool.qrc" >:/images/open_form.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Open Form...</string>
+   </property>
+  </action>
+  <action name="actionLoadTranslation" >
+   <property name="icon" >
+    <iconset resource="qttrpreviewtool.qrc" >:/images/load_translation.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Load Translation...</string>
+   </property>
+  </action>
+  <action name="actionReloadTranslations" >
+   <property name="icon" >
+    <iconset resource="qttrpreviewtool.qrc" >:/images/reload_translations.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Reload Translations</string>
+   </property>
+   <property name="shortcut" >
+    <string>F5</string>
+   </property>
+  </action>
+  <action name="actionClose" >
+   <property name="text" >
+    <string>&amp;Close</string>
+   </property>
+  </action>
+  <action name="actionAbout" >
+   <property name="text" >
+    <string>About</string>
+   </property>
+  </action>
+  <action name="actionAbout_Qt" >
+   <property name="text" >
+    <string>About Qt</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/uic/baseline/trpreviewtool.ui.h
new file mode 100644
index 0000000..e607763
--- /dev/null
+++ b/tests/auto/uic/baseline/trpreviewtool.ui.h
@@ -0,0 +1,203 @@
+/*
+*********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file.  Alternatively you may (at
+** your option) use any later version of the GNU General Public
+** License if such license has been publicly approved by Nokia Corporation and/or its subsidiary(-ies)
+** (or its successors, if any) and the KDE Free Qt Foundation. In
+** addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.2, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
+** you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech, as the sole
+** copyright holder for Qt Designer, grants users of the Qt/Eclipse
+** Integration plug-in the right for the Qt/Eclipse Integration to
+** link to functionality provided by Qt Designer and its related
+** libraries.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
+** granted herein.
+**
+*********************************************************************
+*/
+
+/********************************************************************************
+** Form generated from reading ui file 'trpreviewtool.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef TRPREVIEWTOOL_H
+#define TRPREVIEWTOOL_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDockWidget>
+#include <QtGui/QHeaderView>
+#include <QtGui/QListView>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QStatusBar>
+#include <QtGui/QToolBar>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_TrPreviewToolClass
+{
+public:
+    QAction *actionOpenForm;
+    QAction *actionLoadTranslation;
+    QAction *actionReloadTranslations;
+    QAction *actionClose;
+    QAction *actionAbout;
+    QAction *actionAbout_Qt;
+    QWidget *centralWidget;
+    QMenuBar *menuBar;
+    QMenu *menuView;
+    QMenu *menuViewViews;
+    QMenu *menuHelp;
+    QMenu *menuFile;
+    QToolBar *mainToolBar;
+    QStatusBar *statusBar;
+    QDockWidget *dwForms;
+    QWidget *dockWidgetContents;
+    QVBoxLayout *vboxLayout;
+    QListView *viewForms;
+
+    void setupUi(QMainWindow *TrPreviewToolClass)
+    {
+        if (TrPreviewToolClass->objectName().isEmpty())
+            TrPreviewToolClass->setObjectName(QString::fromUtf8("TrPreviewToolClass"));
+        TrPreviewToolClass->resize(593, 466);
+        actionOpenForm = new QAction(TrPreviewToolClass);
+        actionOpenForm->setObjectName(QString::fromUtf8("actionOpenForm"));
+        const QIcon icon = QIcon(QString::fromUtf8(":/images/open_form.png"));
+        actionOpenForm->setIcon(icon);
+        actionLoadTranslation = new QAction(TrPreviewToolClass);
+        actionLoadTranslation->setObjectName(QString::fromUtf8("actionLoadTranslation"));
+        const QIcon icon1 = QIcon(QString::fromUtf8(":/images/load_translation.png"));
+        actionLoadTranslation->setIcon(icon1);
+        actionReloadTranslations = new QAction(TrPreviewToolClass);
+        actionReloadTranslations->setObjectName(QString::fromUtf8("actionReloadTranslations"));
+        const QIcon icon2 = QIcon(QString::fromUtf8(":/images/reload_translations.png"));
+        actionReloadTranslations->setIcon(icon2);
+        actionClose = new QAction(TrPreviewToolClass);
+        actionClose->setObjectName(QString::fromUtf8("actionClose"));
+        actionAbout = new QAction(TrPreviewToolClass);
+        actionAbout->setObjectName(QString::fromUtf8("actionAbout"));
+        actionAbout_Qt = new QAction(TrPreviewToolClass);
+        actionAbout_Qt->setObjectName(QString::fromUtf8("actionAbout_Qt"));
+        centralWidget = new QWidget(TrPreviewToolClass);
+        centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
+        TrPreviewToolClass->setCentralWidget(centralWidget);
+        menuBar = new QMenuBar(TrPreviewToolClass);
+        menuBar->setObjectName(QString::fromUtf8("menuBar"));
+        menuBar->setGeometry(QRect(0, 0, 593, 21));
+        menuView = new QMenu(menuBar);
+        menuView->setObjectName(QString::fromUtf8("menuView"));
+        menuViewViews = new QMenu(menuView);
+        menuViewViews->setObjectName(QString::fromUtf8("menuViewViews"));
+        menuHelp = new QMenu(menuBar);
+        menuHelp->setObjectName(QString::fromUtf8("menuHelp"));
+        menuFile = new QMenu(menuBar);
+        menuFile->setObjectName(QString::fromUtf8("menuFile"));
+        TrPreviewToolClass->setMenuBar(menuBar);
+        mainToolBar = new QToolBar(TrPreviewToolClass);
+        mainToolBar->setObjectName(QString::fromUtf8("mainToolBar"));
+        mainToolBar->setOrientation(Qt::Horizontal);
+        TrPreviewToolClass->addToolBar(static_cast<Qt::ToolBarArea>(4), mainToolBar);
+        statusBar = new QStatusBar(TrPreviewToolClass);
+        statusBar->setObjectName(QString::fromUtf8("statusBar"));
+        TrPreviewToolClass->setStatusBar(statusBar);
+        dwForms = new QDockWidget(TrPreviewToolClass);
+        dwForms->setObjectName(QString::fromUtf8("dwForms"));
+        dockWidgetContents = new QWidget();
+        dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents"));
+        vboxLayout = new QVBoxLayout(dockWidgetContents);
+        vboxLayout->setSpacing(0);
+        vboxLayout->setMargin(0);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        viewForms = new QListView(dockWidgetContents);
+        viewForms->setObjectName(QString::fromUtf8("viewForms"));
+        viewForms->setEditTriggers(QAbstractItemView::NoEditTriggers);
+        viewForms->setAlternatingRowColors(true);
+        viewForms->setUniformItemSizes(true);
+
+        vboxLayout->addWidget(viewForms);
+
+        dwForms->setWidget(dockWidgetContents);
+        TrPreviewToolClass->addDockWidget(static_cast<Qt::DockWidgetArea>(1), dwForms);
+
+        menuBar->addAction(menuFile->menuAction());
+        menuBar->addAction(menuView->menuAction());
+        menuBar->addAction(menuHelp->menuAction());
+        menuView->addAction(menuViewViews->menuAction());
+        menuHelp->addAction(actionAbout);
+        menuHelp->addAction(actionAbout_Qt);
+        menuFile->addAction(actionOpenForm);
+        menuFile->addAction(actionLoadTranslation);
+        menuFile->addAction(actionReloadTranslations);
+        menuFile->addSeparator();
+        menuFile->addAction(actionClose);
+        mainToolBar->addAction(actionOpenForm);
+        mainToolBar->addAction(actionLoadTranslation);
+        mainToolBar->addAction(actionReloadTranslations);
+
+        retranslateUi(TrPreviewToolClass);
+
+        QMetaObject::connectSlotsByName(TrPreviewToolClass);
+    } // setupUi
+
+    void retranslateUi(QMainWindow *TrPreviewToolClass)
+    {
+        TrPreviewToolClass->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Qt Translation Preview Tool", 0, QApplication::UnicodeUTF8));
+        actionOpenForm->setText(QApplication::translate("TrPreviewToolClass", "&Open Form...", 0, QApplication::UnicodeUTF8));
+        actionLoadTranslation->setText(QApplication::translate("TrPreviewToolClass", "&Load Translation...", 0, QApplication::UnicodeUTF8));
+        actionReloadTranslations->setText(QApplication::translate("TrPreviewToolClass", "&Reload Translations", 0, QApplication::UnicodeUTF8));
+        actionReloadTranslations->setShortcut(QApplication::translate("TrPreviewToolClass", "F5", 0, QApplication::UnicodeUTF8));
+        actionClose->setText(QApplication::translate("TrPreviewToolClass", "&Close", 0, QApplication::UnicodeUTF8));
+        actionAbout->setText(QApplication::translate("TrPreviewToolClass", "About", 0, QApplication::UnicodeUTF8));
+        actionAbout_Qt->setText(QApplication::translate("TrPreviewToolClass", "About Qt", 0, QApplication::UnicodeUTF8));
+        menuView->setTitle(QApplication::translate("TrPreviewToolClass", "&View", 0, QApplication::UnicodeUTF8));
+        menuViewViews->setTitle(QApplication::translate("TrPreviewToolClass", "&Views", 0, QApplication::UnicodeUTF8));
+        menuHelp->setTitle(QApplication::translate("TrPreviewToolClass", "&Help", 0, QApplication::UnicodeUTF8));
+        menuFile->setTitle(QApplication::translate("TrPreviewToolClass", "&File", 0, QApplication::UnicodeUTF8));
+        dwForms->setWindowTitle(QApplication::translate("TrPreviewToolClass", "Forms", 0, QApplication::UnicodeUTF8));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class TrPreviewToolClass: public Ui_TrPreviewToolClass {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // TRPREVIEWTOOL_H
diff --git a/tests/auto/uic/baseline/validators.ui b/tests/auto/uic/baseline/validators.ui
new file mode 100644
index 0000000..f05b96f
--- /dev/null
+++ b/tests/auto/uic/baseline/validators.ui
@@ -0,0 +1,467 @@
+<ui version="4.0" >
+ <class>ValidatorsForm</class>
+ <widget class="QWidget" name="ValidatorsForm" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>526</width>
+    <height>668</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="LocaleSelector" name="localeSelector" />
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>QIntValidator</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>0</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>Min:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QSpinBox" name="minVal" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+              <horstretch>1</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimum" >
+             <number>-1000000</number>
+            </property>
+            <property name="maximum" >
+             <number>1000000</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_2" >
+            <property name="text" >
+             <string>Max:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QSpinBox" name="maxVal" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+              <horstretch>1</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimum" >
+             <number>-1000000</number>
+            </property>
+            <property name="maximum" >
+             <number>1000000</number>
+            </property>
+            <property name="value" >
+             <number>1000</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QFrame" name="frame" >
+          <property name="frameShape" >
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow" >
+           <enum>QFrame::Sunken</enum>
+          </property>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>9</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="LEDWidget" name="ledWidget" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="pixmap" >
+              <pixmap resource="validators.qrc" >:/ledoff.png</pixmap>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_7" >
+             <property name="text" >
+              <string>editingFinished()</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="editor" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>QDoubleValidator</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>0</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
+             <string>Min:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QDoubleSpinBox" name="doubleMinVal" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+              <horstretch>1</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimum" >
+             <double>-100000.000000000000000</double>
+            </property>
+            <property name="maximum" >
+             <double>100000.000000000000000</double>
+            </property>
+            <property name="value" >
+             <double>0.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2" >
+           <widget class="QLabel" name="label_5" >
+            <property name="text" >
+             <string>Format:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3" >
+           <widget class="QComboBox" name="doubleFormat" >
+            <item>
+             <property name="text" >
+              <string>Standard</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Scientific</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_4" >
+            <property name="text" >
+             <string>Max:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QDoubleSpinBox" name="doubleMaxVal" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+              <horstretch>1</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimum" >
+             <double>-100000.000000000000000</double>
+            </property>
+            <property name="maximum" >
+             <double>100000.000000000000000</double>
+            </property>
+            <property name="value" >
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2" >
+           <widget class="QLabel" name="label_6" >
+            <property name="text" >
+             <string>Decimals:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3" >
+           <widget class="QSpinBox" name="doubleDecimals" >
+            <property name="value" >
+             <number>2</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QFrame" name="frame_2" >
+          <property name="frameShape" >
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow" >
+           <enum>QFrame::Sunken</enum>
+          </property>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>9</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="LEDWidget" name="doubleLedWidget" >
+             <property name="text" >
+              <string/>
+             </property>
+             <property name="pixmap" >
+              <pixmap resource="validators.qrc" >:/ledoff.png</pixmap>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_8" >
+             <property name="text" >
+              <string>editingFinished()</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="doubleEditor" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>111</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton" >
+       <property name="text" >
+        <string>Quit</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LEDWidget</class>
+   <extends>QLabel</extends>
+   <header>ledwidget.h</header>
+  </customwidget>
+  <customwidget>
+   <class>LocaleSelector</class>
+   <extends>QComboBox</extends>
+   <header>localeselector.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="validators.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>pushButton</sender>
+   <signal>clicked()</signal>
+   <receiver>ValidatorsForm</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>94</x>
+     <y>274</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>131</x>
+     <y>260</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/validators.ui.h b/tests/auto/uic/baseline/validators.ui.h
new file mode 100644
index 0000000..ea5d319
--- /dev/null
+++ b/tests/auto/uic/baseline/validators.ui.h
@@ -0,0 +1,409 @@
+/********************************************************************************
+** Form generated from reading ui file 'validators.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef VALIDATORS_H
+#define VALIDATORS_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDoubleSpinBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+#include "ledwidget.h"
+#include "localeselector.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_ValidatorsForm
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QHBoxLayout *hboxLayout;
+    LocaleSelector *localeSelector;
+    QSpacerItem *spacerItem;
+    QGroupBox *groupBox;
+    QVBoxLayout *vboxLayout1;
+    QHBoxLayout *hboxLayout1;
+    QGridLayout *gridLayout;
+    QLabel *label;
+    QSpinBox *minVal;
+    QLabel *label_2;
+    QSpinBox *maxVal;
+    QFrame *frame;
+    QVBoxLayout *vboxLayout2;
+    LEDWidget *ledWidget;
+    QLabel *label_7;
+    QSpacerItem *spacerItem1;
+    QLineEdit *editor;
+    QGroupBox *groupBox_2;
+    QVBoxLayout *vboxLayout3;
+    QHBoxLayout *hboxLayout2;
+    QGridLayout *gridLayout1;
+    QLabel *label_3;
+    QDoubleSpinBox *doubleMinVal;
+    QLabel *label_5;
+    QComboBox *doubleFormat;
+    QLabel *label_4;
+    QDoubleSpinBox *doubleMaxVal;
+    QLabel *label_6;
+    QSpinBox *doubleDecimals;
+    QFrame *frame_2;
+    QVBoxLayout *vboxLayout4;
+    LEDWidget *doubleLedWidget;
+    QLabel *label_8;
+    QSpacerItem *spacerItem2;
+    QLineEdit *doubleEditor;
+    QSpacerItem *spacerItem3;
+    QHBoxLayout *hboxLayout3;
+    QSpacerItem *spacerItem4;
+    QPushButton *pushButton;
+
+    void setupUi(QWidget *ValidatorsForm)
+    {
+        if (ValidatorsForm->objectName().isEmpty())
+            ValidatorsForm->setObjectName(QString::fromUtf8("ValidatorsForm"));
+        ValidatorsForm->resize(526, 668);
+        vboxLayout = new QVBoxLayout(ValidatorsForm);
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout->setMargin(9);
+#endif
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setMargin(0);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        localeSelector = new LocaleSelector(ValidatorsForm);
+        localeSelector->setObjectName(QString::fromUtf8("localeSelector"));
+
+        hboxLayout->addWidget(localeSelector);
+
+        spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout->addItem(spacerItem);
+
+
+        vboxLayout->addLayout(hboxLayout);
+
+        groupBox = new QGroupBox(ValidatorsForm);
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        vboxLayout1 = new QVBoxLayout(groupBox);
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout1->setMargin(9);
+#endif
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout1->setMargin(0);
+#endif
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        gridLayout = new QGridLayout();
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setMargin(0);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label = new QLabel(groupBox);
+        label->setObjectName(QString::fromUtf8("label"));
+        label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+        gridLayout->addWidget(label, 0, 0, 1, 1);
+
+        minVal = new QSpinBox(groupBox);
+        minVal->setObjectName(QString::fromUtf8("minVal"));
+        QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(1);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(minVal->sizePolicy().hasHeightForWidth());
+        minVal->setSizePolicy(sizePolicy);
+        minVal->setMinimum(-1000000);
+        minVal->setMaximum(1000000);
+
+        gridLayout->addWidget(minVal, 0, 1, 1, 1);
+
+        label_2 = new QLabel(groupBox);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        label_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+        gridLayout->addWidget(label_2, 1, 0, 1, 1);
+
+        maxVal = new QSpinBox(groupBox);
+        maxVal->setObjectName(QString::fromUtf8("maxVal"));
+        sizePolicy.setHeightForWidth(maxVal->sizePolicy().hasHeightForWidth());
+        maxVal->setSizePolicy(sizePolicy);
+        maxVal->setMinimum(-1000000);
+        maxVal->setMaximum(1000000);
+        maxVal->setValue(1000);
+
+        gridLayout->addWidget(maxVal, 1, 1, 1, 1);
+
+
+        hboxLayout1->addLayout(gridLayout);
+
+        frame = new QFrame(groupBox);
+        frame->setObjectName(QString::fromUtf8("frame"));
+        frame->setFrameShape(QFrame::StyledPanel);
+        frame->setFrameShadow(QFrame::Sunken);
+        vboxLayout2 = new QVBoxLayout(frame);
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout2->setMargin(9);
+#endif
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        ledWidget = new LEDWidget(frame);
+        ledWidget->setObjectName(QString::fromUtf8("ledWidget"));
+        QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(ledWidget->sizePolicy().hasHeightForWidth());
+        ledWidget->setSizePolicy(sizePolicy1);
+        ledWidget->setPixmap(QPixmap(QString::fromUtf8(":/ledoff.png")));
+        ledWidget->setAlignment(Qt::AlignCenter);
+
+        vboxLayout2->addWidget(ledWidget);
+
+        label_7 = new QLabel(frame);
+        label_7->setObjectName(QString::fromUtf8("label_7"));
+
+        vboxLayout2->addWidget(label_7);
+
+
+        hboxLayout1->addWidget(frame);
+
+
+        vboxLayout1->addLayout(hboxLayout1);
+
+        spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        vboxLayout1->addItem(spacerItem1);
+
+        editor = new QLineEdit(groupBox);
+        editor->setObjectName(QString::fromUtf8("editor"));
+
+        vboxLayout1->addWidget(editor);
+
+
+        vboxLayout->addWidget(groupBox);
+
+        groupBox_2 = new QGroupBox(ValidatorsForm);
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        vboxLayout3 = new QVBoxLayout(groupBox_2);
+#ifndef Q_OS_MAC
+        vboxLayout3->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout3->setMargin(9);
+#endif
+        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        hboxLayout2 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout2->setMargin(0);
+#endif
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        gridLayout1 = new QGridLayout();
+#ifndef Q_OS_MAC
+        gridLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout1->setMargin(0);
+#endif
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        label_3 = new QLabel(groupBox_2);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+        label_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+        gridLayout1->addWidget(label_3, 0, 0, 1, 1);
+
+        doubleMinVal = new QDoubleSpinBox(groupBox_2);
+        doubleMinVal->setObjectName(QString::fromUtf8("doubleMinVal"));
+        sizePolicy.setHeightForWidth(doubleMinVal->sizePolicy().hasHeightForWidth());
+        doubleMinVal->setSizePolicy(sizePolicy);
+        doubleMinVal->setMinimum(-100000);
+        doubleMinVal->setMaximum(100000);
+        doubleMinVal->setValue(0);
+
+        gridLayout1->addWidget(doubleMinVal, 0, 1, 1, 1);
+
+        label_5 = new QLabel(groupBox_2);
+        label_5->setObjectName(QString::fromUtf8("label_5"));
+        label_5->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+        gridLayout1->addWidget(label_5, 0, 2, 1, 1);
+
+        doubleFormat = new QComboBox(groupBox_2);
+        doubleFormat->setObjectName(QString::fromUtf8("doubleFormat"));
+
+        gridLayout1->addWidget(doubleFormat, 0, 3, 1, 1);
+
+        label_4 = new QLabel(groupBox_2);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+        label_4->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+        gridLayout1->addWidget(label_4, 1, 0, 1, 1);
+
+        doubleMaxVal = new QDoubleSpinBox(groupBox_2);
+        doubleMaxVal->setObjectName(QString::fromUtf8("doubleMaxVal"));
+        sizePolicy.setHeightForWidth(doubleMaxVal->sizePolicy().hasHeightForWidth());
+        doubleMaxVal->setSizePolicy(sizePolicy);
+        doubleMaxVal->setMinimum(-100000);
+        doubleMaxVal->setMaximum(100000);
+        doubleMaxVal->setValue(1000);
+
+        gridLayout1->addWidget(doubleMaxVal, 1, 1, 1, 1);
+
+        label_6 = new QLabel(groupBox_2);
+        label_6->setObjectName(QString::fromUtf8("label_6"));
+        label_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+        gridLayout1->addWidget(label_6, 1, 2, 1, 1);
+
+        doubleDecimals = new QSpinBox(groupBox_2);
+        doubleDecimals->setObjectName(QString::fromUtf8("doubleDecimals"));
+        doubleDecimals->setValue(2);
+
+        gridLayout1->addWidget(doubleDecimals, 1, 3, 1, 1);
+
+
+        hboxLayout2->addLayout(gridLayout1);
+
+        frame_2 = new QFrame(groupBox_2);
+        frame_2->setObjectName(QString::fromUtf8("frame_2"));
+        frame_2->setFrameShape(QFrame::StyledPanel);
+        frame_2->setFrameShadow(QFrame::Sunken);
+        vboxLayout4 = new QVBoxLayout(frame_2);
+#ifndef Q_OS_MAC
+        vboxLayout4->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout4->setMargin(9);
+#endif
+        vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
+        doubleLedWidget = new LEDWidget(frame_2);
+        doubleLedWidget->setObjectName(QString::fromUtf8("doubleLedWidget"));
+        doubleLedWidget->setPixmap(QPixmap(QString::fromUtf8(":/ledoff.png")));
+        doubleLedWidget->setAlignment(Qt::AlignCenter);
+
+        vboxLayout4->addWidget(doubleLedWidget);
+
+        label_8 = new QLabel(frame_2);
+        label_8->setObjectName(QString::fromUtf8("label_8"));
+
+        vboxLayout4->addWidget(label_8);
+
+
+        hboxLayout2->addWidget(frame_2);
+
+
+        vboxLayout3->addLayout(hboxLayout2);
+
+        spacerItem2 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        vboxLayout3->addItem(spacerItem2);
+
+        doubleEditor = new QLineEdit(groupBox_2);
+        doubleEditor->setObjectName(QString::fromUtf8("doubleEditor"));
+
+        vboxLayout3->addWidget(doubleEditor);
+
+
+        vboxLayout->addWidget(groupBox_2);
+
+        spacerItem3 = new QSpacerItem(20, 111, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        vboxLayout->addItem(spacerItem3);
+
+        hboxLayout3 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout3->setSpacing(6);
+#endif
+        hboxLayout3->setMargin(0);
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout3->addItem(spacerItem4);
+
+        pushButton = new QPushButton(ValidatorsForm);
+        pushButton->setObjectName(QString::fromUtf8("pushButton"));
+
+        hboxLayout3->addWidget(pushButton);
+
+
+        vboxLayout->addLayout(hboxLayout3);
+
+
+        retranslateUi(ValidatorsForm);
+        QObject::connect(pushButton, SIGNAL(clicked()), ValidatorsForm, SLOT(close()));
+
+        QMetaObject::connectSlotsByName(ValidatorsForm);
+    } // setupUi
+
+    void retranslateUi(QWidget *ValidatorsForm)
+    {
+        ValidatorsForm->setWindowTitle(QApplication::translate("ValidatorsForm", "Form", 0, QApplication::UnicodeUTF8));
+        groupBox->setTitle(QApplication::translate("ValidatorsForm", "QIntValidator", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("ValidatorsForm", "Min:", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("ValidatorsForm", "Max:", 0, QApplication::UnicodeUTF8));
+        label_7->setText(QApplication::translate("ValidatorsForm", "editingFinished()", 0, QApplication::UnicodeUTF8));
+        groupBox_2->setTitle(QApplication::translate("ValidatorsForm", "QDoubleValidator", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("ValidatorsForm", "Min:", 0, QApplication::UnicodeUTF8));
+        label_5->setText(QApplication::translate("ValidatorsForm", "Format:", 0, QApplication::UnicodeUTF8));
+        doubleFormat->clear();
+        doubleFormat->insertItems(0, QStringList()
+         << QApplication::translate("ValidatorsForm", "Standard", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("ValidatorsForm", "Scientific", 0, QApplication::UnicodeUTF8)
+        );
+        label_4->setText(QApplication::translate("ValidatorsForm", "Max:", 0, QApplication::UnicodeUTF8));
+        label_6->setText(QApplication::translate("ValidatorsForm", "Decimals:", 0, QApplication::UnicodeUTF8));
+        doubleLedWidget->setText(QString());
+        label_8->setText(QApplication::translate("ValidatorsForm", "editingFinished()", 0, QApplication::UnicodeUTF8));
+        pushButton->setText(QApplication::translate("ValidatorsForm", "Quit", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(ValidatorsForm);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class ValidatorsForm: public Ui_ValidatorsForm {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // VALIDATORS_H
diff --git a/tests/auto/uic/baseline/wateringconfigdialog.ui b/tests/auto/uic/baseline/wateringconfigdialog.ui
new file mode 100644
index 0000000..a7f5349
--- /dev/null
+++ b/tests/auto/uic/baseline/wateringconfigdialog.ui
@@ -0,0 +1,446 @@
+<ui version="4.0" >
+ <class>WateringConfigDialog</class>
+ <widget class="QDialog" name="WateringConfigDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>334</width>
+    <height>550</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Watering Configuration</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label_3" >
+       <property name="text" >
+        <string>Plant:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" colspan="3" >
+      <widget class="QComboBox" name="plantComboBox" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text" >
+         <string>Squash</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Bean</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Carrot</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Strawberry</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Raspberry</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Blueberry</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>67</width>
+         <height>16</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>Water when:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" colspan="3" >
+      <widget class="QCheckBox" name="temperatureCheckBox" >
+       <property name="text" >
+        <string>Temperature is higher than:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="4" column="2" >
+      <widget class="QSpinBox" name="temperatureSpinBox" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="specialValueText" >
+        <string/>
+       </property>
+       <property name="suffix" >
+        <string>C</string>
+       </property>
+       <property name="minimum" >
+        <number>10</number>
+       </property>
+       <property name="maximum" >
+        <number>60</number>
+       </property>
+       <property name="value" >
+        <number>20</number>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="3" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="5" column="1" colspan="3" >
+      <widget class="QCheckBox" name="rainCheckBox" >
+       <property name="text" >
+        <string>Rain less than:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="6" column="2" >
+      <widget class="QSpinBox" name="rainSpinBox" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="specialValueText" >
+        <string/>
+       </property>
+       <property name="suffix" >
+        <string>mm</string>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="3" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="7" column="2" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="8" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Starting Time:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1" colspan="3" >
+      <widget class="QTimeEdit" name="startTimeEdit" />
+     </item>
+     <item row="9" column="0" >
+      <widget class="QLabel" name="label_4" >
+       <property name="text" >
+        <string>Amount:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="1" colspan="3" >
+      <widget class="QSpinBox" name="amountSpinBox" >
+       <property name="suffix" >
+        <string>l</string>
+       </property>
+       <property name="minimum" >
+        <number>100</number>
+       </property>
+       <property name="maximum" >
+        <number>10000</number>
+       </property>
+       <property name="singleStep" >
+        <number>100</number>
+       </property>
+       <property name="value" >
+        <number>1000</number>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="0" >
+      <widget class="QLabel" name="label_5" >
+       <property name="text" >
+        <string>Source:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="1" colspan="3" >
+      <widget class="QComboBox" name="sourceComboBox" >
+       <item>
+        <property name="text" >
+         <string>Foundain</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>River</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Lake</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Public Water System</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="11" column="0" >
+      <widget class="QLabel" name="label_6" >
+       <property name="text" >
+        <string>Filter:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="11" column="1" colspan="2" >
+      <widget class="QCheckBox" name="filterCheckBox" >
+       <property name="text" >
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="12" column="0" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>10</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="4" column="4" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" >
+     <item row="0" column="1" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0" colspan="2" >
+      <widget class="HelpBrowser" name="helpBrowser" />
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="helpLabel" >
+       <property name="text" >
+        <string>&lt;a href="test">Show Details&lt;/a></string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HelpBrowser</class>
+   <extends>QTextBrowser</extends>
+   <header>helpbrowser.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>WateringConfigDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>227</x>
+     <y>372</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>WateringConfigDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>286</x>
+     <y>378</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>temperatureCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>temperatureSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>132</x>
+     <y>101</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>132</x>
+     <y>125</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>rainCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>rainSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>110</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>113</x>
+     <y>169</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tests/auto/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/uic/baseline/wateringconfigdialog.ui.h
new file mode 100644
index 0000000..02de59b
--- /dev/null
+++ b/tests/auto/uic/baseline/wateringconfigdialog.ui.h
@@ -0,0 +1,290 @@
+/********************************************************************************
+** Form generated from reading ui file 'wateringconfigdialog.ui'
+**
+** Created: Thu Jul 10 09:47:35 2008
+**      by: Qt User Interface Compiler version 4.5.0
+**
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
+#ifndef WATERINGCONFIGDIALOG_H
+#define WATERINGCONFIGDIALOG_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QTimeEdit>
+#include <QtGui/QVBoxLayout>
+#include "helpbrowser.h"
+
+QT_BEGIN_NAMESPACE
+
+class Ui_WateringConfigDialog
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QGridLayout *gridLayout;
+    QLabel *label_3;
+    QComboBox *plantComboBox;
+    QSpacerItem *spacerItem;
+    QLabel *label_2;
+    QCheckBox *temperatureCheckBox;
+    QSpacerItem *spacerItem1;
+    QSpinBox *temperatureSpinBox;
+    QSpacerItem *spacerItem2;
+    QCheckBox *rainCheckBox;
+    QSpacerItem *spacerItem3;
+    QSpinBox *rainSpinBox;
+    QSpacerItem *spacerItem4;
+    QSpacerItem *spacerItem5;
+    QLabel *label;
+    QTimeEdit *startTimeEdit;
+    QLabel *label_4;
+    QSpinBox *amountSpinBox;
+    QLabel *label_5;
+    QComboBox *sourceComboBox;
+    QLabel *label_6;
+    QCheckBox *filterCheckBox;
+    QSpacerItem *spacerItem6;
+    QSpacerItem *spacerItem7;
+    QGridLayout *gridLayout1;
+    QSpacerItem *spacerItem8;
+    HelpBrowser *helpBrowser;
+    QLabel *helpLabel;
+    QFrame *line;
+    QDialogButtonBox *buttonBox;
+
+    void setupUi(QDialog *WateringConfigDialog)
+    {
+        if (WateringConfigDialog->objectName().isEmpty())
+            WateringConfigDialog->setObjectName(QString::fromUtf8("WateringConfigDialog"));
+        WateringConfigDialog->resize(334, 550);
+        vboxLayout = new QVBoxLayout(WateringConfigDialog);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        gridLayout = new QGridLayout();
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        label_3 = new QLabel(WateringConfigDialog);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+
+        gridLayout->addWidget(label_3, 0, 0, 1, 1);
+
+        plantComboBox = new QComboBox(WateringConfigDialog);
+        plantComboBox->setObjectName(QString::fromUtf8("plantComboBox"));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(plantComboBox->sizePolicy().hasHeightForWidth());
+        plantComboBox->setSizePolicy(sizePolicy);
+
+        gridLayout->addWidget(plantComboBox, 0, 1, 1, 3);
+
+        spacerItem = new QSpacerItem(67, 16, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem, 1, 0, 1, 1);
+
+        label_2 = new QLabel(WateringConfigDialog);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+
+        gridLayout->addWidget(label_2, 2, 0, 1, 1);
+
+        temperatureCheckBox = new QCheckBox(WateringConfigDialog);
+        temperatureCheckBox->setObjectName(QString::fromUtf8("temperatureCheckBox"));
+
+        gridLayout->addWidget(temperatureCheckBox, 3, 1, 1, 3);
+
+        spacerItem1 = new QSpacerItem(16, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem1, 4, 1, 1, 1);
+
+        temperatureSpinBox = new QSpinBox(WateringConfigDialog);
+        temperatureSpinBox->setObjectName(QString::fromUtf8("temperatureSpinBox"));
+        temperatureSpinBox->setEnabled(false);
+        temperatureSpinBox->setMinimum(10);
+        temperatureSpinBox->setMaximum(60);
+        temperatureSpinBox->setValue(20);
+
+        gridLayout->addWidget(temperatureSpinBox, 4, 2, 1, 1);
+
+        spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem2, 4, 3, 1, 1);
+
+        rainCheckBox = new QCheckBox(WateringConfigDialog);
+        rainCheckBox->setObjectName(QString::fromUtf8("rainCheckBox"));
+
+        gridLayout->addWidget(rainCheckBox, 5, 1, 1, 3);
+
+        spacerItem3 = new QSpacerItem(16, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem3, 6, 1, 1, 1);
+
+        rainSpinBox = new QSpinBox(WateringConfigDialog);
+        rainSpinBox->setObjectName(QString::fromUtf8("rainSpinBox"));
+        rainSpinBox->setEnabled(false);
+        rainSpinBox->setMinimum(1);
+
+        gridLayout->addWidget(rainSpinBox, 6, 2, 1, 1);
+
+        spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem4, 6, 3, 1, 1);
+
+        spacerItem5 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem5, 7, 2, 1, 1);
+
+        label = new QLabel(WateringConfigDialog);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        gridLayout->addWidget(label, 8, 0, 1, 1);
+
+        startTimeEdit = new QTimeEdit(WateringConfigDialog);
+        startTimeEdit->setObjectName(QString::fromUtf8("startTimeEdit"));
+
+        gridLayout->addWidget(startTimeEdit, 8, 1, 1, 3);
+
+        label_4 = new QLabel(WateringConfigDialog);
+        label_4->setObjectName(QString::fromUtf8("label_4"));
+
+        gridLayout->addWidget(label_4, 9, 0, 1, 1);
+
+        amountSpinBox = new QSpinBox(WateringConfigDialog);
+        amountSpinBox->setObjectName(QString::fromUtf8("amountSpinBox"));
+        amountSpinBox->setMinimum(100);
+        amountSpinBox->setMaximum(10000);
+        amountSpinBox->setSingleStep(100);
+        amountSpinBox->setValue(1000);
+
+        gridLayout->addWidget(amountSpinBox, 9, 1, 1, 3);
+
+        label_5 = new QLabel(WateringConfigDialog);
+        label_5->setObjectName(QString::fromUtf8("label_5"));
+
+        gridLayout->addWidget(label_5, 10, 0, 1, 1);
+
+        sourceComboBox = new QComboBox(WateringConfigDialog);
+        sourceComboBox->setObjectName(QString::fromUtf8("sourceComboBox"));
+
+        gridLayout->addWidget(sourceComboBox, 10, 1, 1, 3);
+
+        label_6 = new QLabel(WateringConfigDialog);
+        label_6->setObjectName(QString::fromUtf8("label_6"));
+
+        gridLayout->addWidget(label_6, 11, 0, 1, 1);
+
+        filterCheckBox = new QCheckBox(WateringConfigDialog);
+        filterCheckBox->setObjectName(QString::fromUtf8("filterCheckBox"));
+
+        gridLayout->addWidget(filterCheckBox, 11, 1, 1, 2);
+
+        spacerItem6 = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        gridLayout->addItem(spacerItem6, 12, 0, 1, 1);
+
+        spacerItem7 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout->addItem(spacerItem7, 4, 4, 1, 1);
+
+
+        vboxLayout->addLayout(gridLayout);
+
+        gridLayout1 = new QGridLayout();
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        spacerItem8 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout1->addItem(spacerItem8, 0, 1, 1, 1);
+
+        helpBrowser = new HelpBrowser(WateringConfigDialog);
+        helpBrowser->setObjectName(QString::fromUtf8("helpBrowser"));
+
+        gridLayout1->addWidget(helpBrowser, 1, 0, 1, 2);
+
+        helpLabel = new QLabel(WateringConfigDialog);
+        helpLabel->setObjectName(QString::fromUtf8("helpLabel"));
+
+        gridLayout1->addWidget(helpLabel, 0, 0, 1, 1);
+
+
+        vboxLayout->addLayout(gridLayout1);
+
+        line = new QFrame(WateringConfigDialog);
+        line->setObjectName(QString::fromUtf8("line"));
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+
+        vboxLayout->addWidget(line);
+
+        buttonBox = new QDialogButtonBox(WateringConfigDialog);
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
+        buttonBox->setOrientation(Qt::Horizontal);
+        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+
+        vboxLayout->addWidget(buttonBox);
+
+
+        retranslateUi(WateringConfigDialog);
+        QObject::connect(buttonBox, SIGNAL(accepted()), WateringConfigDialog, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), WateringConfigDialog, SLOT(reject()));
+        QObject::connect(temperatureCheckBox, SIGNAL(toggled(bool)), temperatureSpinBox, SLOT(setEnabled(bool)));
+        QObject::connect(rainCheckBox, SIGNAL(toggled(bool)), rainSpinBox, SLOT(setEnabled(bool)));
+
+        QMetaObject::connectSlotsByName(WateringConfigDialog);
+    } // setupUi
+
+    void retranslateUi(QDialog *WateringConfigDialog)
+    {
+        WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", 0, QApplication::UnicodeUTF8));
+        plantComboBox->clear();
+        plantComboBox->insertItems(0, QStringList()
+         << QApplication::translate("WateringConfigDialog", "Squash", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "Bean", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "Carrot", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "Strawberry", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "Raspberry", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "Blueberry", 0, QApplication::UnicodeUTF8)
+        );
+        label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", 0, QApplication::UnicodeUTF8));
+        temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", 0, QApplication::UnicodeUTF8));
+        temperatureSpinBox->setSpecialValueText(QString());
+        temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", 0, QApplication::UnicodeUTF8));
+        rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", 0, QApplication::UnicodeUTF8));
+        rainSpinBox->setSpecialValueText(QString());
+        rainSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "mm", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("WateringConfigDialog", "Starting Time:", 0, QApplication::UnicodeUTF8));
+        label_4->setText(QApplication::translate("WateringConfigDialog", "Amount:", 0, QApplication::UnicodeUTF8));
+        amountSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "l", 0, QApplication::UnicodeUTF8));
+        label_5->setText(QApplication::translate("WateringConfigDialog", "Source:", 0, QApplication::UnicodeUTF8));
+        sourceComboBox->clear();
+        sourceComboBox->insertItems(0, QStringList()
+         << QApplication::translate("WateringConfigDialog", "Foundain", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "River", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "Lake", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("WateringConfigDialog", "Public Water System", 0, QApplication::UnicodeUTF8)
+        );
+        label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", 0, QApplication::UnicodeUTF8));
+        filterCheckBox->setText(QString());
+        helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(WateringConfigDialog);
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class WateringConfigDialog: public Ui_WateringConfigDialog {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // WATERINGCONFIGDIALOG_H