summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/moc/cxx11-explicit-override-control.h40
-rw-r--r--tests/auto/tools/moc/moc.pro2
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp8
-rw-r--r--tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/Main_Window.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/Widget.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/addlinkdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/addtorrentform.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/authenticationdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/backside.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/batchtranslation.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/bookmarkdialog.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/bookwindow.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/browserwidget.ui.h1
-rw-r--r--tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/buttongroup.ui270
-rw-r--r--tests/auto/tools/uic/baseline/buttongroup.ui.h216
-rw-r--r--tests/auto/tools/uic/baseline/calculator.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/calculatorform.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/certificateinfo.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/chatdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/chatmainwindow.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/chatsetnickname.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/config.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/connectdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/controller.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/cookies.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/cookiesexceptions.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/default.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/dialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/downloaditem.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/downloads.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/embeddeddialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/enumnostdset.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/filespage.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/filternamedialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/filterpage.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/finddialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/form.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/formwindowsettings.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/generalpage.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/gridalignment.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/gridpanel.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/helpdialog.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/history.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/icontheme.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/idbased.ui37
-rw-r--r--tests/auto/tools/uic/baseline/idbased.ui.h67
-rw-r--r--tests/auto/tools/uic/baseline/identifierpage.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/imagedialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/inputpage.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/installdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/languagesdialog.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/listwidgeteditor.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/mainwindow.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/mydialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/myform.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/newactiondialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/newform.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/orderdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/outputpage.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/pagefold.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/paletteeditor.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/passworddialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/pathpage.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/phrasebookbox.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/plugindialog.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/preferencesdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/previewdialogbase.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/previewwidget.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/proxy.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qfiledialog.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qprintwidget.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qtgradientdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qtgradienteditor.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qtgradientview.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/qttoolbardialog.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/qttrid.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/querywidget.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/remotecontrol.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/saveformastemplate.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/settings.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/signalslotdialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/sslclient.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/sslerrors.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/statistics.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/stringlisteditor.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/stylesheeteditor.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/tabbedbrowser.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/tetrixwindow.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/textfinder.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/topicchooser.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/translatedialog.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h3
-rw-r--r--tests/auto/tools/uic/baseline/translationsettings.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/treewidgeteditor.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/trpreviewtool.ui.h2
-rw-r--r--tests/auto/tools/uic/baseline/validators.ui.h3
-rw-r--r--tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h3
110 files changed, 615 insertions, 303 deletions
diff --git a/tests/auto/tools/moc/cxx11-explicit-override-control.h b/tests/auto/tools/moc/cxx11-explicit-override-control.h
index f361a47248..2211112717 100644
--- a/tests/auto/tools/moc/cxx11-explicit-override-control.h
+++ b/tests/auto/tools/moc/cxx11-explicit-override-control.h
@@ -132,17 +132,17 @@ public:
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
- void pureSlot0() Q_DECL_OVERRIDE {}
- void pureSlot1() Q_DECL_OVERRIDE {}
- void pureSlot2() const Q_DECL_OVERRIDE {}
- void pureSlot3() Q_DECL_OVERRIDE const {}
+ void pureSlot0() override {}
+ void pureSlot1() override {}
+ void pureSlot2() const override {}
+ void pureSlot3() override const {}
#if 0 // moc doesn't support volatile slots
- void pureSlot4() volatile Q_DECL_OVERRIDE {}
- void pureSlot5() Q_DECL_OVERRIDE volatile {}
- void pureSlot6() const volatile Q_DECL_OVERRIDE {}
- void pureSlot7() volatile Q_DECL_OVERRIDE const {}
- void pureSlot8() const Q_DECL_OVERRIDE volatile {}
- void pureSlot9() Q_DECL_OVERRIDE volatile const {}
+ void pureSlot4() volatile override {}
+ void pureSlot5() override volatile {}
+ void pureSlot6() const volatile override {}
+ void pureSlot7() volatile override const {}
+ void pureSlot8() const override volatile {}
+ void pureSlot9() override volatile const {}
#endif
};
@@ -176,17 +176,17 @@ public:
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
- void pureSlot0() Q_DECL_FINAL Q_DECL_OVERRIDE {}
- void pureSlot1() Q_DECL_OVERRIDE Q_DECL_FINAL {}
- void pureSlot2() Q_DECL_OVERRIDE const Q_DECL_FINAL {}
- void pureSlot3() Q_DECL_FINAL const Q_DECL_OVERRIDE {}
+ void pureSlot0() Q_DECL_FINAL override {}
+ void pureSlot1() override Q_DECL_FINAL {}
+ void pureSlot2() override const Q_DECL_FINAL {}
+ void pureSlot3() Q_DECL_FINAL const override {}
#if 0 // moc doesn't support volatile slots
- void pureSlot4() volatile Q_DECL_FINAL Q_DECL_OVERRIDE {}
- void pureSlot5() Q_DECL_OVERRIDE Q_DECL_FINAL volatile {}
- void pureSlot6() Q_DECL_OVERRIDE const volatile Q_DECL_FINAL {}
- void pureSlot7() volatile Q_DECL_OVERRIDE Q_DECL_FINAL const {}
- void pureSlot8() const Q_DECL_FINAL Q_DECL_OVERRIDE volatile {}
- void pureSlot9() Q_DECL_FINAL volatile const Q_DECL_OVERRIDE {}
+ void pureSlot4() volatile Q_DECL_FINAL override {}
+ void pureSlot5() override Q_DECL_FINAL volatile {}
+ void pureSlot6() override const volatile Q_DECL_FINAL {}
+ void pureSlot7() volatile override Q_DECL_FINAL const {}
+ void pureSlot8() const Q_DECL_FINAL override volatile {}
+ void pureSlot9() Q_DECL_FINAL volatile const override {}
#endif
};
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index b7151f9c16..d2b13f9c4e 100644
--- a/tests/auto/tools/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
@@ -32,7 +32,7 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n
namespace.h cxx17-namespaces.h
-if(*-g++*|*-icc*|*-clang*|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
+if(*-g++*|*-icc*|*-clang*|*-llvm):!win32-*: HEADERS += os9-newlines.h win-newlines.h
if(*-g++*|*-clang*): HEADERS += dollars.h
SOURCES += tst_moc.cpp
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 55e8054a70..753da401a2 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -43,7 +43,7 @@
#include "pure-virtual-signals.h"
#include "qinvokable.h"
// msvc and friends crap out on it
-#if !defined(Q_CC_GNU) || defined(Q_OS_IRIX) || defined(Q_OS_WIN)
+#if !defined(Q_CC_GNU) || defined(Q_OS_WIN)
#define SKIP_NEWLINE_TEST
#endif
#if !defined(SKIP_NEWLINE_TEST)
@@ -163,7 +163,7 @@ class CreatableGadget
public:
Q_INVOKABLE CreatableGadget()
{
- CreatableGadget::qt_static_metacall((QObject*)this, QMetaObject::ReadProperty, -1, Q_NULLPTR);
+ CreatableGadget::qt_static_metacall((QObject*)this, QMetaObject::ReadProperty, -1, nullptr);
}
};
@@ -223,7 +223,7 @@ namespace {
{
Q_OBJECT
public:
- explicit ObjectInUnnamedNS(QObject *parent = Q_NULLPTR) : QObject(parent) {}
+ explicit ObjectInUnnamedNS(QObject *parent = nullptr) : QObject(parent) {}
};
}
@@ -3768,7 +3768,7 @@ void tst_Moc::veryLongStringData()
void tst_Moc::gadgetHierarchy()
{
- QCOMPARE(NonGadgetParent::Derived::staticMetaObject.superClass(), static_cast<const QMetaObject*>(Q_NULLPTR));
+ QCOMPARE(NonGadgetParent::Derived::staticMetaObject.superClass(), static_cast<const QMetaObject*>(nullptr));
QCOMPARE(GrandParentGadget::DerivedGadget::staticMetaObject.superClass(), &GrandParentGadget::BaseGadget::staticMetaObject);
}
diff --git a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
index 81908b1eae..d8db966b76 100644
--- a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
+++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
@@ -10,12 +10,9 @@
#define DIALOG_WITH_BUTTONS_BOTTOM_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QHeaderView>
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h
index 55dfd6ba49..b167eaec8a 100644
--- a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h
+++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h
@@ -10,12 +10,9 @@
#define DIALOG_WITH_BUTTONS_RIGHT_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QHeaderView>
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h
index d1592b950c..52e9f3b931 100644
--- a/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h
+++ b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h
@@ -10,11 +10,8 @@
#define DIALOG_WITHOUT_BUTTONS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
-#include <QtWidgets/QHeaderView>
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/tools/uic/baseline/Main_Window.ui.h b/tests/auto/tools/uic/baseline/Main_Window.ui.h
index 7fc0781262..eba78c1a2b 100644
--- a/tests/auto/tools/uic/baseline/Main_Window.ui.h
+++ b/tests/auto/tools/uic/baseline/Main_Window.ui.h
@@ -10,10 +10,7 @@
#define MAIN_WINDOW_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenuBar>
#include <QtWidgets/QStatusBar>
diff --git a/tests/auto/tools/uic/baseline/Widget.ui.h b/tests/auto/tools/uic/baseline/Widget.ui.h
index 4705159fea..8cb31b4589 100644
--- a/tests/auto/tools/uic/baseline/Widget.ui.h
+++ b/tests/auto/tools/uic/baseline/Widget.ui.h
@@ -10,11 +10,8 @@
#define WIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QVBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
index 466f8660fd..71d091380a 100644
--- a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
@@ -10,14 +10,11 @@
#define ADDLINKDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QFrame>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/addtorrentform.ui.h b/tests/auto/tools/uic/baseline/addtorrentform.ui.h
index 521a76847b..e76f05f1de 100644
--- a/tests/auto/tools/uic/baseline/addtorrentform.ui.h
+++ b/tests/auto/tools/uic/baseline/addtorrentform.ui.h
@@ -10,14 +10,11 @@
#define ADDTORRENTFORM_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
index 2c760be6c8..331770b5e0 100644
--- a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
@@ -10,13 +10,10 @@
#define AUTHENTICATIONDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/backside.ui.h b/tests/auto/tools/uic/baseline/backside.ui.h
index c78b474277..963eb082ae 100644
--- a/tests/auto/tools/uic/baseline/backside.ui.h
+++ b/tests/auto/tools/uic/baseline/backside.ui.h
@@ -10,9 +10,7 @@
#define BACKSIDE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDateTimeEdit>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
diff --git a/tests/auto/tools/uic/baseline/batchtranslation.ui.h b/tests/auto/tools/uic/baseline/batchtranslation.ui.h
index 53fc9052b2..1f55b6230e 100644
--- a/tests/auto/tools/uic/baseline/batchtranslation.ui.h
+++ b/tests/auto/tools/uic/baseline/batchtranslation.ui.h
@@ -40,14 +40,11 @@
#define BATCHTRANSLATION_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QListView>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h
index f5ec343a89..c2bb062bb8 100644
--- a/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h
@@ -10,9 +10,7 @@
#define BOOKMARKDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
diff --git a/tests/auto/tools/uic/baseline/bookwindow.ui.h b/tests/auto/tools/uic/baseline/bookwindow.ui.h
index daf441e5d9..89b1e04c6c 100644
--- a/tests/auto/tools/uic/baseline/bookwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/bookwindow.ui.h
@@ -10,9 +10,7 @@
#define BOOKWINDOW_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QGroupBox>
diff --git a/tests/auto/tools/uic/baseline/browserwidget.ui.h b/tests/auto/tools/uic/baseline/browserwidget.ui.h
index e5bebd8f59..491f51ce94 100644
--- a/tests/auto/tools/uic/baseline/browserwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/browserwidget.ui.h
@@ -12,7 +12,6 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QHeaderView>
diff --git a/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h b/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h
index caac7e31aa..5a545485e3 100644
--- a/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h
+++ b/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h
@@ -10,9 +10,7 @@
#define BUG18156QTREEWIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/buttongroup.ui b/tests/auto/tools/uic/baseline/buttongroup.ui
new file mode 100644
index 0000000000..364aebeda6
--- /dev/null
+++ b/tests/auto/tools/uic/baseline/buttongroup.ui
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>545</width>
+ <height>471</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Easing curves</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="2">
+ <widget class="QListWidget" name="easingCurvePicker">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>120</height>
+ </size>
+ </property>
+ <property name="verticalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="movement">
+ <enum>QListView::Static</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="selectionRectVisible">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Path type</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="lineRadio">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Line</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <attribute name="buttonGroup">
+ <string>buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="circleRadio">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Circle</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string>buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Properties</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Period</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QDoubleSpinBox" name="periodSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <double>-1.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>-1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="amplitudeSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <double>-1.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>-1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Overshoot</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QDoubleSpinBox" name="overshootSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <double>-1.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>-1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Amplitude</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="1">
+ <widget class="QGraphicsView" name="graphicsView">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+ <buttongroups>
+ <buttongroup name="buttonGroup"/>
+ </buttongroups>
+</ui>
diff --git a/tests/auto/tools/uic/baseline/buttongroup.ui.h b/tests/auto/tools/uic/baseline/buttongroup.ui.h
new file mode 100644
index 0000000000..38029df7ec
--- /dev/null
+++ b/tests/auto/tools/uic/baseline/buttongroup.ui.h
@@ -0,0 +1,216 @@
+/********************************************************************************
+** Form generated from reading UI file 'buttongroup.ui'
+**
+** Created by: Qt User Interface Compiler version 5.10.1
+**
+** WARNING! All changes made in this file will be lost when recompiling UI file!
+********************************************************************************/
+
+#ifndef BUTTONGROUP_H
+#define BUTTONGROUP_H
+
+#include <QtCore/QVariant>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QDoubleSpinBox>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QGraphicsView>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QSpacerItem>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Form
+{
+public:
+ QGridLayout *gridLayout;
+ QListWidget *easingCurvePicker;
+ QVBoxLayout *verticalLayout;
+ QGroupBox *groupBox_2;
+ QGridLayout *gridLayout_2;
+ QRadioButton *lineRadio;
+ QRadioButton *circleRadio;
+ QGroupBox *groupBox;
+ QFormLayout *formLayout;
+ QLabel *label;
+ QDoubleSpinBox *periodSpinBox;
+ QDoubleSpinBox *amplitudeSpinBox;
+ QLabel *label_3;
+ QDoubleSpinBox *overshootSpinBox;
+ QLabel *label_2;
+ QSpacerItem *verticalSpacer;
+ QGraphicsView *graphicsView;
+ QButtonGroup *buttonGroup;
+
+ void setupUi(QWidget *Form)
+ {
+ if (Form->objectName().isEmpty())
+ Form->setObjectName(QStringLiteral("Form"));
+ Form->resize(545, 471);
+ gridLayout = new QGridLayout(Form);
+ gridLayout->setObjectName(QStringLiteral("gridLayout"));
+ easingCurvePicker = new QListWidget(Form);
+ easingCurvePicker->setObjectName(QStringLiteral("easingCurvePicker"));
+ QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ sizePolicy.setHorizontalStretch(0);
+ sizePolicy.setVerticalStretch(0);
+ sizePolicy.setHeightForWidth(easingCurvePicker->sizePolicy().hasHeightForWidth());
+ easingCurvePicker->setSizePolicy(sizePolicy);
+ easingCurvePicker->setMaximumSize(QSize(16777215, 120));
+ easingCurvePicker->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ easingCurvePicker->setMovement(QListView::Static);
+ easingCurvePicker->setProperty("isWrapping", QVariant(false));
+ easingCurvePicker->setViewMode(QListView::IconMode);
+ easingCurvePicker->setSelectionRectVisible(false);
+
+ gridLayout->addWidget(easingCurvePicker, 0, 0, 1, 2);
+
+ verticalLayout = new QVBoxLayout();
+ verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
+ groupBox_2 = new QGroupBox(Form);
+ groupBox_2->setObjectName(QStringLiteral("groupBox_2"));
+ groupBox_2->setMaximumSize(QSize(16777215, 16777215));
+ gridLayout_2 = new QGridLayout(groupBox_2);
+ gridLayout_2->setObjectName(QStringLiteral("gridLayout_2"));
+ lineRadio = new QRadioButton(groupBox_2);
+ buttonGroup = new QButtonGroup(Form);
+ buttonGroup->setObjectName(QStringLiteral("buttonGroup"));
+ buttonGroup->addButton(lineRadio);
+ lineRadio->setObjectName(QStringLiteral("lineRadio"));
+ lineRadio->setMaximumSize(QSize(16777215, 40));
+ lineRadio->setLayoutDirection(Qt::LeftToRight);
+ lineRadio->setChecked(true);
+
+ gridLayout_2->addWidget(lineRadio, 0, 0, 1, 1);
+
+ circleRadio = new QRadioButton(groupBox_2);
+ buttonGroup->addButton(circleRadio);
+ circleRadio->setObjectName(QStringLiteral("circleRadio"));
+ circleRadio->setMaximumSize(QSize(16777215, 40));
+
+ gridLayout_2->addWidget(circleRadio, 1, 0, 1, 1);
+
+
+ verticalLayout->addWidget(groupBox_2);
+
+ groupBox = new QGroupBox(Form);
+ groupBox->setObjectName(QStringLiteral("groupBox"));
+ QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Preferred);
+ sizePolicy1.setHorizontalStretch(0);
+ sizePolicy1.setVerticalStretch(0);
+ sizePolicy1.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth());
+ groupBox->setSizePolicy(sizePolicy1);
+ formLayout = new QFormLayout(groupBox);
+ formLayout->setObjectName(QStringLiteral("formLayout"));
+ formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+ label = new QLabel(groupBox);
+ label->setObjectName(QStringLiteral("label"));
+ QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred);
+ sizePolicy2.setHorizontalStretch(0);
+ sizePolicy2.setVerticalStretch(0);
+ sizePolicy2.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+ label->setSizePolicy(sizePolicy2);
+ label->setMinimumSize(QSize(0, 30));
+
+ formLayout->setWidget(0, QFormLayout::LabelRole, label);
+
+ periodSpinBox = new QDoubleSpinBox(groupBox);
+ periodSpinBox->setObjectName(QStringLiteral("periodSpinBox"));
+ periodSpinBox->setEnabled(false);
+ QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Fixed);
+ sizePolicy3.setHorizontalStretch(0);
+ sizePolicy3.setVerticalStretch(0);
+ sizePolicy3.setHeightForWidth(periodSpinBox->sizePolicy().hasHeightForWidth());
+ periodSpinBox->setSizePolicy(sizePolicy3);
+ periodSpinBox->setMinimumSize(QSize(0, 30));
+ periodSpinBox->setMinimum(-1);
+ periodSpinBox->setSingleStep(0.1);
+ periodSpinBox->setValue(-1);
+
+ formLayout->setWidget(0, QFormLayout::FieldRole, periodSpinBox);
+
+ amplitudeSpinBox = new QDoubleSpinBox(groupBox);
+ amplitudeSpinBox->setObjectName(QStringLiteral("amplitudeSpinBox"));
+ amplitudeSpinBox->setEnabled(false);
+ amplitudeSpinBox->setMinimumSize(QSize(0, 30));
+ amplitudeSpinBox->setMinimum(-1);
+ amplitudeSpinBox->setSingleStep(0.1);
+ amplitudeSpinBox->setValue(-1);
+
+ formLayout->setWidget(2, QFormLayout::FieldRole, amplitudeSpinBox);
+
+ label_3 = new QLabel(groupBox);
+ label_3->setObjectName(QStringLiteral("label_3"));
+ label_3->setMinimumSize(QSize(0, 30));
+
+ formLayout->setWidget(4, QFormLayout::LabelRole, label_3);
+
+ overshootSpinBox = new QDoubleSpinBox(groupBox);
+ overshootSpinBox->setObjectName(QStringLiteral("overshootSpinBox"));
+ overshootSpinBox->setEnabled(false);
+ overshootSpinBox->setMinimumSize(QSize(0, 30));
+ overshootSpinBox->setMinimum(-1);
+ overshootSpinBox->setSingleStep(0.1);
+ overshootSpinBox->setValue(-1);
+
+ formLayout->setWidget(4, QFormLayout::FieldRole, overshootSpinBox);
+
+ label_2 = new QLabel(groupBox);
+ label_2->setObjectName(QStringLiteral("label_2"));
+ label_2->setMinimumSize(QSize(0, 30));
+
+ formLayout->setWidget(2, QFormLayout::LabelRole, label_2);
+
+
+ verticalLayout->addWidget(groupBox);
+
+ verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+ verticalLayout->addItem(verticalSpacer);
+
+
+ gridLayout->addLayout(verticalLayout, 1, 0, 1, 1);
+
+ graphicsView = new QGraphicsView(Form);
+ graphicsView->setObjectName(QStringLiteral("graphicsView"));
+ QSizePolicy sizePolicy4(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ sizePolicy4.setHorizontalStretch(0);
+ sizePolicy4.setVerticalStretch(0);
+ sizePolicy4.setHeightForWidth(graphicsView->sizePolicy().hasHeightForWidth());
+ graphicsView->setSizePolicy(sizePolicy4);
+
+ gridLayout->addWidget(graphicsView, 1, 1, 1, 1);
+
+
+ retranslateUi(Form);
+
+ QMetaObject::connectSlotsByName(Form);
+ } // setupUi
+
+ void retranslateUi(QWidget *Form)
+ {
+ Form->setWindowTitle(QApplication::translate("Form", "Easing curves", nullptr));
+ groupBox_2->setTitle(QApplication::translate("Form", "Path type", nullptr));
+ lineRadio->setText(QApplication::translate("Form", "Line", nullptr));
+ circleRadio->setText(QApplication::translate("Form", "Circle", nullptr));
+ groupBox->setTitle(QApplication::translate("Form", "Properties", nullptr));
+ label->setText(QApplication::translate("Form", "Period", nullptr));
+ label_3->setText(QApplication::translate("Form", "Overshoot", nullptr));
+ label_2->setText(QApplication::translate("Form", "Amplitude", nullptr));
+ } // retranslateUi
+
+};
+
+namespace Ui {
+ class Form: public Ui_Form {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // BUTTONGROUP_H
diff --git a/tests/auto/tools/uic/baseline/calculator.ui.h b/tests/auto/tools/uic/baseline/calculator.ui.h
index 5c8b8640d3..ad738d7afc 100644
--- a/tests/auto/tools/uic/baseline/calculator.ui.h
+++ b/tests/auto/tools/uic/baseline/calculator.ui.h
@@ -10,10 +10,7 @@
#define CALCULATOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QToolButton>
#include <QtWidgets/QWidget>
diff --git a/tests/auto/tools/uic/baseline/calculatorform.ui.h b/tests/auto/tools/uic/baseline/calculatorform.ui.h
index 86482c7814..ced29d5eab 100644
--- a/tests/auto/tools/uic/baseline/calculatorform.ui.h
+++ b/tests/auto/tools/uic/baseline/calculatorform.ui.h
@@ -10,12 +10,9 @@
#define CALCULATORFORM_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QSpinBox>
diff --git a/tests/auto/tools/uic/baseline/certificateinfo.ui.h b/tests/auto/tools/uic/baseline/certificateinfo.ui.h
index ac31a209e2..07263bcdd7 100644
--- a/tests/auto/tools/uic/baseline/certificateinfo.ui.h
+++ b/tests/auto/tools/uic/baseline/certificateinfo.ui.h
@@ -10,14 +10,11 @@
#define CERTIFICATEINFO_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QVBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/chatdialog.ui.h b/tests/auto/tools/uic/baseline/chatdialog.ui.h
index 48c6e2d3a1..32b083fbc4 100644
--- a/tests/auto/tools/uic/baseline/chatdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/chatdialog.ui.h
@@ -10,12 +10,9 @@
#define CHATDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h
index 2764761023..921eb376de 100644
--- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h
@@ -12,9 +12,7 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QMainWindow>
diff --git a/tests/auto/tools/uic/baseline/chatsetnickname.ui.h b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h
index 0fc8d99ab3..6aaa47f84e 100644
--- a/tests/auto/tools/uic/baseline/chatsetnickname.ui.h
+++ b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h
@@ -10,12 +10,9 @@
#define CHATSETNICKNAME_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/config.ui.h b/tests/auto/tools/uic/baseline/config.ui.h
index d0c4c95e72..7948f6b4ba 100644
--- a/tests/auto/tools/uic/baseline/config.ui.h
+++ b/tests/auto/tools/uic/baseline/config.ui.h
@@ -40,16 +40,13 @@
#define CONFIG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QRadioButton>
diff --git a/tests/auto/tools/uic/baseline/connectdialog.ui.h b/tests/auto/tools/uic/baseline/connectdialog.ui.h
index fde460c483..935f8a21a1 100644
--- a/tests/auto/tools/uic/baseline/connectdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/connectdialog.ui.h
@@ -10,16 +10,13 @@
#define CONNECTDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QToolButton>
diff --git a/tests/auto/tools/uic/baseline/controller.ui.h b/tests/auto/tools/uic/baseline/controller.ui.h
index 41e3c005d2..e3382e2c17 100644
--- a/tests/auto/tools/uic/baseline/controller.ui.h
+++ b/tests/auto/tools/uic/baseline/controller.ui.h
@@ -10,11 +10,8 @@
#define CONTROLLER_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QWidget>
diff --git a/tests/auto/tools/uic/baseline/cookies.ui.h b/tests/auto/tools/uic/baseline/cookies.ui.h
index d6b3c4a2f2..2702fb489f 100644
--- a/tests/auto/tools/uic/baseline/cookies.ui.h
+++ b/tests/auto/tools/uic/baseline/cookies.ui.h
@@ -10,9 +10,7 @@
#define COOKIES_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h
index 80f40d0228..eaa39e3e78 100644
--- a/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h
+++ b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h
@@ -10,9 +10,7 @@
#define COOKIESEXCEPTIONS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h
index 46dfa8240c..4fae8e7130 100644
--- a/tests/auto/tools/uic/baseline/default.ui.h
+++ b/tests/auto/tools/uic/baseline/default.ui.h
@@ -12,12 +12,10 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
diff --git a/tests/auto/tools/uic/baseline/dialog.ui.h b/tests/auto/tools/uic/baseline/dialog.ui.h
index afcb9f2f8b..1aa41c2ac8 100644
--- a/tests/auto/tools/uic/baseline/dialog.ui.h
+++ b/tests/auto/tools/uic/baseline/dialog.ui.h
@@ -10,12 +10,9 @@
#define DIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/downloaditem.ui.h b/tests/auto/tools/uic/baseline/downloaditem.ui.h
index cd3068daee..2e854aa9ed 100644
--- a/tests/auto/tools/uic/baseline/downloaditem.ui.h
+++ b/tests/auto/tools/uic/baseline/downloaditem.ui.h
@@ -10,11 +10,8 @@
#define DOWNLOADITEM_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QProgressBar>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/downloads.ui.h b/tests/auto/tools/uic/baseline/downloads.ui.h
index 4bc5f70bde..5ac40a9581 100644
--- a/tests/auto/tools/uic/baseline/downloads.ui.h
+++ b/tests/auto/tools/uic/baseline/downloads.ui.h
@@ -10,9 +10,7 @@
#define DOWNLOADS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
index 554c5d754c..67ef6e1de1 100644
--- a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
@@ -10,14 +10,11 @@
#define EMBEDDEDDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QFontComboBox>
#include <QtWidgets/QFormLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QSlider>
diff --git a/tests/auto/tools/uic/baseline/enumnostdset.ui.h b/tests/auto/tools/uic/baseline/enumnostdset.ui.h
index 31e1348a1a..451cbd6a68 100644
--- a/tests/auto/tools/uic/baseline/enumnostdset.ui.h
+++ b/tests/auto/tools/uic/baseline/enumnostdset.ui.h
@@ -10,10 +10,7 @@
#define ENUMNOSTDSET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QWidget>
#include "worldtimeclock.h"
diff --git a/tests/auto/tools/uic/baseline/filespage.ui.h b/tests/auto/tools/uic/baseline/filespage.ui.h
index 7337c3a044..8ab8d09768 100644
--- a/tests/auto/tools/uic/baseline/filespage.ui.h
+++ b/tests/auto/tools/uic/baseline/filespage.ui.h
@@ -10,11 +10,8 @@
#define FILESPAGE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/filternamedialog.ui.h b/tests/auto/tools/uic/baseline/filternamedialog.ui.h
index 1a223e28aa..60642c29f6 100644
--- a/tests/auto/tools/uic/baseline/filternamedialog.ui.h
+++ b/tests/auto/tools/uic/baseline/filternamedialog.ui.h
@@ -10,14 +10,11 @@
#define FILTERNAMEDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/filterpage.ui.h b/tests/auto/tools/uic/baseline/filterpage.ui.h
index c260c82efe..a20dffc09a 100644
--- a/tests/auto/tools/uic/baseline/filterpage.ui.h
+++ b/tests/auto/tools/uic/baseline/filterpage.ui.h
@@ -10,9 +10,7 @@
#define FILTERPAGE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHeaderView>
diff --git a/tests/auto/tools/uic/baseline/finddialog.ui.h b/tests/auto/tools/uic/baseline/finddialog.ui.h
index 4d7d1ac92c..0bb1ec4286 100644
--- a/tests/auto/tools/uic/baseline/finddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/finddialog.ui.h
@@ -40,15 +40,12 @@
#define FINDDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/form.ui.h b/tests/auto/tools/uic/baseline/form.ui.h
index 4cd134102c..fc4f3e079c 100644
--- a/tests/auto/tools/uic/baseline/form.ui.h
+++ b/tests/auto/tools/uic/baseline/form.ui.h
@@ -10,11 +10,8 @@
#define FORM_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QSpinBox>
diff --git a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h
index 77d0109548..349ef9ac80 100644
--- a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h
+++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h
@@ -40,16 +40,13 @@
#define FORMWINDOWSETTINGS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/generalpage.ui.h b/tests/auto/tools/uic/baseline/generalpage.ui.h
index 3c36c75bfa..cb0c4e92c4 100644
--- a/tests/auto/tools/uic/baseline/generalpage.ui.h
+++ b/tests/auto/tools/uic/baseline/generalpage.ui.h
@@ -10,11 +10,8 @@
#define GENERALPAGE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/gridalignment.ui.h b/tests/auto/tools/uic/baseline/gridalignment.ui.h
index f7f2d6372f..8e243ce800 100644
--- a/tests/auto/tools/uic/baseline/gridalignment.ui.h
+++ b/tests/auto/tools/uic/baseline/gridalignment.ui.h
@@ -10,11 +10,8 @@
#define GRIDALIGNMENT_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QWidget>
diff --git a/tests/auto/tools/uic/baseline/gridpanel.ui.h b/tests/auto/tools/uic/baseline/gridpanel.ui.h
index 95437a27cf..feeff26013 100644
--- a/tests/auto/tools/uic/baseline/gridpanel.ui.h
+++ b/tests/auto/tools/uic/baseline/gridpanel.ui.h
@@ -10,14 +10,11 @@
#define GRIDPANEL_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/helpdialog.ui.h b/tests/auto/tools/uic/baseline/helpdialog.ui.h
index 39f9852620..7c584639c2 100644
--- a/tests/auto/tools/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/helpdialog.ui.h
@@ -40,9 +40,7 @@
#define HELPDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/history.ui.h b/tests/auto/tools/uic/baseline/history.ui.h
index ed0637bfcf..f9050de854 100644
--- a/tests/auto/tools/uic/baseline/history.ui.h
+++ b/tests/auto/tools/uic/baseline/history.ui.h
@@ -10,9 +10,7 @@
#define HISTORY_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/icontheme.ui.h b/tests/auto/tools/uic/baseline/icontheme.ui.h
index 2724c7d147..94122c01de 100644
--- a/tests/auto/tools/uic/baseline/icontheme.ui.h
+++ b/tests/auto/tools/uic/baseline/icontheme.ui.h
@@ -10,10 +10,7 @@
#define ICONTHEME_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget>
diff --git a/tests/auto/tools/uic/baseline/idbased.ui b/tests/auto/tools/uic/baseline/idbased.ui
new file mode 100644
index 0000000000..f4db5139c8
--- /dev/null
+++ b/tests/auto/tools/uic/baseline/idbased.ui
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0" idbasedtr="true">
+ <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 id="windowTitleId">Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="toolTip">
+ <string id="buttonToolTipId">ButtonToolTip</string>
+ </property>
+ <property name="statusTip">
+ <string id="buttonStatusTipId">ButtonStatusTip</string>
+ </property>
+ <property name="whatsThis">
+ <string id="buttonWhatsThisId">ButtonWhatsThis</string>
+ </property>
+ <property name="text">
+ <string id="buttonTextId">PushButton</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/tools/uic/baseline/idbased.ui.h b/tests/auto/tools/uic/baseline/idbased.ui.h
new file mode 100644
index 0000000000..dbcd92a839
--- /dev/null
+++ b/tests/auto/tools/uic/baseline/idbased.ui.h
@@ -0,0 +1,67 @@
+/********************************************************************************
+** Form generated from reading UI file 'idbased.ui'
+**
+** Created by: Qt User Interface Compiler version 5.11.0
+**
+** WARNING! All changes made in this file will be lost when recompiling UI file!
+********************************************************************************/
+
+#ifndef IDBASED_H
+#define IDBASED_H
+
+#include <QtCore/QVariant>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_Form
+{
+public:
+ QVBoxLayout *verticalLayout;
+ QPushButton *pushButton;
+
+ void setupUi(QWidget *Form)
+ {
+ if (Form->objectName().isEmpty())
+ Form->setObjectName(QStringLiteral("Form"));
+ Form->resize(400, 300);
+ verticalLayout = new QVBoxLayout(Form);
+ verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
+ pushButton = new QPushButton(Form);
+ pushButton->setObjectName(QStringLiteral("pushButton"));
+
+ verticalLayout->addWidget(pushButton);
+
+
+ retranslateUi(Form);
+
+ QMetaObject::connectSlotsByName(Form);
+ } // setupUi
+
+ void retranslateUi(QWidget *Form)
+ {
+ Form->setWindowTitle(qtTrId("windowTitleId"));
+#ifndef QT_NO_TOOLTIP
+ pushButton->setToolTip(qtTrId("buttonToolTipId"));
+#endif // QT_NO_TOOLTIP
+#ifndef QT_NO_STATUSTIP
+ pushButton->setStatusTip(qtTrId("buttonStatusTipId"));
+#endif // QT_NO_STATUSTIP
+#ifndef QT_NO_WHATSTHIS
+ pushButton->setWhatsThis(qtTrId("buttonWhatsThisId"));
+#endif // QT_NO_WHATSTHIS
+ pushButton->setText(qtTrId("buttonTextId"));
+ } // retranslateUi
+
+};
+
+namespace Ui {
+ class Form: public Ui_Form {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // IDBASED_H
diff --git a/tests/auto/tools/uic/baseline/identifierpage.ui.h b/tests/auto/tools/uic/baseline/identifierpage.ui.h
index fd77cc3f8c..d16333cc9c 100644
--- a/tests/auto/tools/uic/baseline/identifierpage.ui.h
+++ b/tests/auto/tools/uic/baseline/identifierpage.ui.h
@@ -10,12 +10,9 @@
#define IDENTIFIERPAGE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/imagedialog.ui.h b/tests/auto/tools/uic/baseline/imagedialog.ui.h
index 2b55d1f0ab..29a30d1996 100644
--- a/tests/auto/tools/uic/baseline/imagedialog.ui.h
+++ b/tests/auto/tools/uic/baseline/imagedialog.ui.h
@@ -10,14 +10,11 @@
#define IMAGEDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/inputpage.ui.h b/tests/auto/tools/uic/baseline/inputpage.ui.h
index 542cf82b91..fb7ae1ea6f 100644
--- a/tests/auto/tools/uic/baseline/inputpage.ui.h
+++ b/tests/auto/tools/uic/baseline/inputpage.ui.h
@@ -10,12 +10,9 @@
#define INPUTPAGE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/installdialog.ui.h b/tests/auto/tools/uic/baseline/installdialog.ui.h
index 657e88712d..885488d2a7 100644
--- a/tests/auto/tools/uic/baseline/installdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/installdialog.ui.h
@@ -10,13 +10,10 @@
#define INSTALLDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
diff --git a/tests/auto/tools/uic/baseline/languagesdialog.ui.h b/tests/auto/tools/uic/baseline/languagesdialog.ui.h
index 20e1ed857c..981ff20cbf 100644
--- a/tests/auto/tools/uic/baseline/languagesdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/languagesdialog.ui.h
@@ -10,9 +10,7 @@
#define LANGUAGESDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QHeaderView>
diff --git a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h
index f3f09e2f1e..06f55dba4c 100644
--- a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h
@@ -40,15 +40,12 @@
#define LISTWIDGETEDITOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/mainwindow.ui.h b/tests/auto/tools/uic/baseline/mainwindow.ui.h
index 496b105e5d..950040aeed 100644
--- a/tests/auto/tools/uic/baseline/mainwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/mainwindow.ui.h
@@ -12,13 +12,11 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QFontComboBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
diff --git a/tests/auto/tools/uic/baseline/mydialog.ui.h b/tests/auto/tools/uic/baseline/mydialog.ui.h
index 35b787b591..95864d5195 100644
--- a/tests/auto/tools/uic/baseline/mydialog.ui.h
+++ b/tests/auto/tools/uic/baseline/mydialog.ui.h
@@ -10,11 +10,8 @@
#define MYDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QVBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/myform.ui.h b/tests/auto/tools/uic/baseline/myform.ui.h
index eeddb03306..d52c1ecf75 100644
--- a/tests/auto/tools/uic/baseline/myform.ui.h
+++ b/tests/auto/tools/uic/baseline/myform.ui.h
@@ -10,13 +10,10 @@
#define MYFORM_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QVBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/newactiondialog.ui.h b/tests/auto/tools/uic/baseline/newactiondialog.ui.h
index a2dbb6e8c2..993ff456b8 100644
--- a/tests/auto/tools/uic/baseline/newactiondialog.ui.h
+++ b/tests/auto/tools/uic/baseline/newactiondialog.ui.h
@@ -40,15 +40,12 @@
#define NEWACTIONDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QFrame>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
index 85109748e4..d0279cf21f 100644
--- a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
+++ b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
@@ -10,15 +10,12 @@
#define NEWDYNAMICPROPERTYDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/newform.ui.h b/tests/auto/tools/uic/baseline/newform.ui.h
index 34b5b1a3eb..26da1b6fc2 100644
--- a/tests/auto/tools/uic/baseline/newform.ui.h
+++ b/tests/auto/tools/uic/baseline/newform.ui.h
@@ -40,9 +40,7 @@
#define NEWFORM_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
diff --git a/tests/auto/tools/uic/baseline/orderdialog.ui.h b/tests/auto/tools/uic/baseline/orderdialog.ui.h
index eb1f90d23b..e2b9762510 100644
--- a/tests/auto/tools/uic/baseline/orderdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/orderdialog.ui.h
@@ -40,14 +40,11 @@
#define ORDERDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QToolButton>
diff --git a/tests/auto/tools/uic/baseline/outputpage.ui.h b/tests/auto/tools/uic/baseline/outputpage.ui.h
index 9648be0ed4..1024ba1c19 100644
--- a/tests/auto/tools/uic/baseline/outputpage.ui.h
+++ b/tests/auto/tools/uic/baseline/outputpage.ui.h
@@ -10,11 +10,8 @@
#define OUTPUTPAGE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/pagefold.ui.h b/tests/auto/tools/uic/baseline/pagefold.ui.h
index 255ed41400..c0ec214e85 100644
--- a/tests/auto/tools/uic/baseline/pagefold.ui.h
+++ b/tests/auto/tools/uic/baseline/pagefold.ui.h
@@ -12,13 +12,11 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
diff --git a/tests/auto/tools/uic/baseline/paletteeditor.ui.h b/tests/auto/tools/uic/baseline/paletteeditor.ui.h
index c91658a4bf..3ccdf6082d 100644
--- a/tests/auto/tools/uic/baseline/paletteeditor.ui.h
+++ b/tests/auto/tools/uic/baseline/paletteeditor.ui.h
@@ -40,9 +40,7 @@
#define PALETTEEDITOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/passworddialog.ui.h b/tests/auto/tools/uic/baseline/passworddialog.ui.h
index 9d42642b93..d47835b57b 100644
--- a/tests/auto/tools/uic/baseline/passworddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/passworddialog.ui.h
@@ -10,14 +10,11 @@
#define PASSWORDDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
diff --git a/tests/auto/tools/uic/baseline/pathpage.ui.h b/tests/auto/tools/uic/baseline/pathpage.ui.h
index 49a2c56f2e..361831721b 100644
--- a/tests/auto/tools/uic/baseline/pathpage.ui.h
+++ b/tests/auto/tools/uic/baseline/pathpage.ui.h
@@ -10,11 +10,8 @@
#define PATHPAGE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
diff --git a/tests/auto/tools/uic/baseline/phrasebookbox.ui.h b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h
index 7f2c052f63..e41a7061b4 100644
--- a/tests/auto/tools/uic/baseline/phrasebookbox.ui.h
+++ b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h
@@ -40,9 +40,7 @@
#define PHRASEBOOKBOX_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/plugindialog.ui.h b/tests/auto/tools/uic/baseline/plugindialog.ui.h
index 56228c0fea..30256a35c2 100644
--- a/tests/auto/tools/uic/baseline/plugindialog.ui.h
+++ b/tests/auto/tools/uic/baseline/plugindialog.ui.h
@@ -40,9 +40,7 @@
#define PLUGINDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QHBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h
index 3f7a23f970..15761b2cdc 100644
--- a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h
@@ -10,9 +10,7 @@
#define PREFERENCESDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
@@ -20,7 +18,6 @@
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QToolButton>
diff --git a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
index 3ed75ec2b5..60bf65af45 100644
--- a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
@@ -10,14 +10,11 @@
#define PREVIEWCONFIGURATIONWIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QToolButton>
#include <textpropertyeditor_p.h>
diff --git a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
index b379d9195f..7ea1e72e04 100644
--- a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
+++ b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
@@ -10,9 +10,7 @@
#define PREVIEWDIALOGBASE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
diff --git a/tests/auto/tools/uic/baseline/previewwidget.ui.h b/tests/auto/tools/uic/baseline/previewwidget.ui.h
index 7bfcbac86a..a86fec7c0d 100644
--- a/tests/auto/tools/uic/baseline/previewwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/previewwidget.ui.h
@@ -40,15 +40,12 @@
#define PREVIEWWIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QProgressBar>
diff --git a/tests/auto/tools/uic/baseline/proxy.ui.h b/tests/auto/tools/uic/baseline/proxy.ui.h
index 67a9ab2b35..2112324eae 100644
--- a/tests/auto/tools/uic/baseline/proxy.ui.h
+++ b/tests/auto/tools/uic/baseline/proxy.ui.h
@@ -10,13 +10,10 @@
#define PROXY_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
diff --git a/tests/auto/tools/uic/baseline/qfiledialog.ui.h b/tests/auto/tools/uic/baseline/qfiledialog.ui.h
index 98b05c34b6..cd1891c58c 100644
--- a/tests/auto/tools/uic/baseline/qfiledialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qfiledialog.ui.h
@@ -40,9 +40,7 @@
#define QFILEDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
diff --git a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h
index b49853b1c4..5b0a5b9dc6 100644
--- a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h
@@ -10,15 +10,12 @@
#define QPAGESETUPWIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDoubleSpinBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h
index 9f1b96129e..baa9bbec38 100644
--- a/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h
+++ b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h
@@ -10,9 +10,7 @@
#define QPRINTPROPERTIESWIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QTabWidget>
diff --git a/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h
index 04978f44b7..a0f16c998b 100644
--- a/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h
+++ b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h
@@ -10,14 +10,11 @@
#define QPRINTSETTINGSOUTPUT_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/qprintwidget.ui.h b/tests/auto/tools/uic/baseline/qprintwidget.ui.h
index f22d0741f2..73fa2cfcfa 100644
--- a/tests/auto/tools/uic/baseline/qprintwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/qprintwidget.ui.h
@@ -10,15 +10,12 @@
#define QPRINTWIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
index e2de642905..5ed3ff1acd 100644
--- a/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
@@ -10,16 +10,13 @@
#define QSQLCONNECTIONDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h
index 9da153f156..53fd59295b 100644
--- a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h
@@ -40,12 +40,9 @@
#define QTGRADIENTDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QVBoxLayout>
#include "qtgradienteditor.h"
diff --git a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h
index 76e0001e16..6e63c4863d 100644
--- a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h
@@ -40,14 +40,11 @@
#define QTGRADIENTEDITOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDoubleSpinBox>
#include <QtWidgets/QFrame>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/qtgradientview.ui.h b/tests/auto/tools/uic/baseline/qtgradientview.ui.h
index 8b1fe38cfc..4d51c2400e 100644
--- a/tests/auto/tools/uic/baseline/qtgradientview.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradientview.ui.h
@@ -10,11 +10,8 @@
#define QTGRADIENTVIEW_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QToolButton>
diff --git a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h
index ab90939445..74fe3745c9 100644
--- a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h
@@ -40,12 +40,9 @@
#define QTGRADIENTVIEWDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QVBoxLayout>
#include "qtgradientview.h"
diff --git a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
index 604cbdaf9d..62d99b3235 100644
--- a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
@@ -10,9 +10,7 @@
#define QTRESOURCEEDITORDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h
index f329cc2b8b..1c546aa196 100644
--- a/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h
@@ -10,9 +10,7 @@
#define QTTOOLBARDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/qttrid.ui.h b/tests/auto/tools/uic/baseline/qttrid.ui.h
index 3a2b73284b..3893ef3569 100644
--- a/tests/auto/tools/uic/baseline/qttrid.ui.h
+++ b/tests/auto/tools/uic/baseline/qttrid.ui.h
@@ -12,12 +12,10 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QMainWindow>
diff --git a/tests/auto/tools/uic/baseline/querywidget.ui.h b/tests/auto/tools/uic/baseline/querywidget.ui.h
index 092259784b..0e941a0e5e 100644
--- a/tests/auto/tools/uic/baseline/querywidget.ui.h
+++ b/tests/auto/tools/uic/baseline/querywidget.ui.h
@@ -10,12 +10,9 @@
#define QUERYWIDGET_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenuBar>
#include <QtWidgets/QStatusBar>
diff --git a/tests/auto/tools/uic/baseline/remotecontrol.ui.h b/tests/auto/tools/uic/baseline/remotecontrol.ui.h
index c1a8f8ae1c..c3a563f235 100644
--- a/tests/auto/tools/uic/baseline/remotecontrol.ui.h
+++ b/tests/auto/tools/uic/baseline/remotecontrol.ui.h
@@ -12,12 +12,10 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QMainWindow>
diff --git a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
index ba458e5ac7..6cd8726d07 100644
--- a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
+++ b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
@@ -40,15 +40,12 @@
#define SAVEFORMASTEMPLATE_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QFrame>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QVBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/settings.ui.h b/tests/auto/tools/uic/baseline/settings.ui.h
index e2ab074a46..6a1f11fa85 100644
--- a/tests/auto/tools/uic/baseline/settings.ui.h
+++ b/tests/auto/tools/uic/baseline/settings.ui.h
@@ -10,14 +10,11 @@
#define SETTINGS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QSlider>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/signalslotdialog.ui.h b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h
index 9063482969..ad6c5776e1 100644
--- a/tests/auto/tools/uic/baseline/signalslotdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h
@@ -10,14 +10,11 @@
#define SIGNALSLOTDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QListView>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QToolButton>
diff --git a/tests/auto/tools/uic/baseline/sslclient.ui.h b/tests/auto/tools/uic/baseline/sslclient.ui.h
index ad3b5b99e4..3e7feab75a 100644
--- a/tests/auto/tools/uic/baseline/sslclient.ui.h
+++ b/tests/auto/tools/uic/baseline/sslclient.ui.h
@@ -10,13 +10,10 @@
#define SSLCLIENT_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/sslerrors.ui.h b/tests/auto/tools/uic/baseline/sslerrors.ui.h
index 246d622632..d920908de6 100644
--- a/tests/auto/tools/uic/baseline/sslerrors.ui.h
+++ b/tests/auto/tools/uic/baseline/sslerrors.ui.h
@@ -10,12 +10,9 @@
#define SSLERRORS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/statistics.ui.h b/tests/auto/tools/uic/baseline/statistics.ui.h
index fb47be7135..ab0f4f9b8d 100644
--- a/tests/auto/tools/uic/baseline/statistics.ui.h
+++ b/tests/auto/tools/uic/baseline/statistics.ui.h
@@ -40,14 +40,11 @@
#define STATISTICS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h
index 96b6df74ea..44603f1e8a 100644
--- a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h
@@ -40,15 +40,12 @@
#define STRINGLISTEDITOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListView>
diff --git a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h
index 539d6fdab9..a867317820 100644
--- a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h
@@ -10,13 +10,10 @@
#define STYLESHEETEDITOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
index 869e33c3aa..4ebbf3c435 100644
--- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
@@ -40,14 +40,11 @@
#define TABBEDBROWSER_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
diff --git a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h
index 5c39ab4444..ff000305cc 100644
--- a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h
@@ -40,9 +40,7 @@
#define TABLEWIDGETEDITOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/tetrixwindow.ui.h b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h
index 131a352714..32c6464209 100644
--- a/tests/auto/tools/uic/baseline/tetrixwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h
@@ -10,11 +10,8 @@
#define TETRIXWINDOW_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLCDNumber>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/textfinder.ui.h b/tests/auto/tools/uic/baseline/textfinder.ui.h
index 7443eacc48..beae214e19 100644
--- a/tests/auto/tools/uic/baseline/textfinder.ui.h
+++ b/tests/auto/tools/uic/baseline/textfinder.ui.h
@@ -10,11 +10,8 @@
#define TEXTFINDER_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/topicchooser.ui.h b/tests/auto/tools/uic/baseline/topicchooser.ui.h
index 9a30232ff7..2770553775 100644
--- a/tests/auto/tools/uic/baseline/topicchooser.ui.h
+++ b/tests/auto/tools/uic/baseline/topicchooser.ui.h
@@ -10,12 +10,9 @@
#define TOPICCHOOSER_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/translatedialog.ui.h b/tests/auto/tools/uic/baseline/translatedialog.ui.h
index 0dcd249d68..32b73be37a 100644
--- a/tests/auto/tools/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/tools/uic/baseline/translatedialog.ui.h
@@ -40,15 +40,12 @@
#define TRANSLATEDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h b/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h
index 9251582ef8..1da7140f97 100644
--- a/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h
+++ b/tests/auto/tools/uic/baseline/translation/Dialog_without_Buttons_tr.h
@@ -10,11 +10,8 @@
#define DIALOG_WITHOUT_BUTTONS_TR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
-#include <QtWidgets/QHeaderView>
#include <ki18n.h>
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/tools/uic/baseline/translationsettings.ui.h b/tests/auto/tools/uic/baseline/translationsettings.ui.h
index ef4e3ab819..522c9bd4e0 100644
--- a/tests/auto/tools/uic/baseline/translationsettings.ui.h
+++ b/tests/auto/tools/uic/baseline/translationsettings.ui.h
@@ -10,15 +10,12 @@
#define TRANSLATIONSETTINGS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QVBoxLayout>
diff --git a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h
index 6257bb8245..13957e843c 100644
--- a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h
@@ -40,9 +40,7 @@
#define TREEWIDGETEDITOR_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
diff --git a/tests/auto/tools/uic/baseline/trpreviewtool.ui.h b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h
index d23e8bae4c..da6e86a8ce 100644
--- a/tests/auto/tools/uic/baseline/trpreviewtool.ui.h
+++ b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h
@@ -42,9 +42,7 @@
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDockWidget>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QListView>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenu>
diff --git a/tests/auto/tools/uic/baseline/validators.ui.h b/tests/auto/tools/uic/baseline/validators.ui.h
index 546c050dd8..a28f9e8390 100644
--- a/tests/auto/tools/uic/baseline/validators.ui.h
+++ b/tests/auto/tools/uic/baseline/validators.ui.h
@@ -10,16 +10,13 @@
#define VALIDATORS_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDoubleSpinBox>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
diff --git a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h
index 48820b14a0..1254eee3f7 100644
--- a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h
@@ -10,16 +10,13 @@
#define WATERINGCONFIGDIALOG_H
#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFrame>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QSpinBox>