From a213def8e9bf36d3554373e623a8e84ef46ad960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 23 Sep 2018 13:07:23 +0200
Subject: Add includes to UI files to resolve FTBFS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 buildtools/ada/adaproject_optionsdlgbase.ui        | 11 +---
 buildtools/ant/antoptionswidget.ui                 | 13 ++--
 buildtools/ant/classpathwidget.ui                  | 10 +---
 buildtools/autotools/addapplicationdlgbase.ui      |  7 ++-
 buildtools/autotools/addexistingdlgbase.ui         | 12 ++--
 buildtools/autotools/addfiledlgbase.ui             | 12 ++--
 buildtools/autotools/addicondlgbase.ui             |  6 +-
 buildtools/autotools/addservicedlgbase.ui          |  5 +-
 buildtools/autotools/addsubprojectdlgbase.ui       |  9 +--
 buildtools/autotools/addtargetdlgbase.ui           | 11 ++--
 buildtools/autotools/autoprojectviewbase.ui        |  6 +-
 buildtools/autotools/choosetargetdlgbase.ui        | 15 ++---
 buildtools/autotools/configureoptionswidgetbase.ui | 10 ++--
 buildtools/autotools/removetargetdlgbase.ui        | 12 ++--
 buildtools/autotools/subprojectoptionsdlgbase.ui   |  7 ++-
 buildtools/autotools/targetoptionsdlgbase.ui       | 17 ++----
 .../custombuildoptionswidgetbase.ui                | 12 ++--
 .../custommakefiles/custommakeconfigwidgetbase.ui  | 12 ++--
 .../custommakefiles/custommanagerwidgetbase.ui     |  7 +--
 .../custommakefiles/selectnewfilesdialogbase.ui    |  6 +-
 .../lib/widgets/environmentdisplaydialogbase.ui    |  6 +-
 buildtools/lib/widgets/makeoptionswidgetbase.ui    |  5 +-
 buildtools/lib/widgets/runoptionswidgetbase.ui     | 20 ++-----
 buildtools/lib/widgets/subclassesdlgbase.ui        | 12 ++--
 buildtools/pascal/pascalproject_optionsdlgbase.ui  | 12 ++--
 buildtools/qmake/choosesubprojectdlgbase.ui        |  8 +--
 buildtools/qmake/createscopedlgbase.ui             | 14 ++---
 buildtools/qmake/disablesubprojectdlgbase.ui       |  9 ++-
 buildtools/qmake/newwidgetdlgbase.ui               |  9 +--
 buildtools/qmake/projectconfigurationdlgbase.ui    | 70 +++-------------------
 buildtools/qmake/qmakeoptionswidgetbase.ui         |  8 +--
 buildtools/script/scriptoptionswidgetbase.ui       |  5 +-
 32 files changed, 129 insertions(+), 249 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui
index 522467c6..b98bc1a3 100644
--- a/buildtools/ada/adaproject_optionsdlgbase.ui
+++ b/buildtools/ada/adaproject_optionsdlgbase.ui
@@ -458,15 +458,10 @@
     <slot access="protected">setDirty()</slot>
     <slot access="protected">setDefaultOptions()</slot>
 </Q_SLOTS>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>tqwidget.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui
index 0beab188..f7274b55 100644
--- a/buildtools/ant/antoptionswidget.ui
+++ b/buildtools/ant/antoptionswidget.ui
@@ -156,18 +156,13 @@
     <tabstop>Verbosity</tabstop>
     <tabstop>Properties</tabstop>
 </tabstops>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/buildtools/ant/classpathwidget.ui b/buildtools/ant/classpathwidget.ui
index 61c8f305..3f17cb5b 100644
--- a/buildtools/ant/classpathwidget.ui
+++ b/buildtools/ant/classpathwidget.ui
@@ -26,14 +26,10 @@
         </widget>
     </hbox>
 </widget>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
-    <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">keditlistbox.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui
index 9b357801..e7495907 100644
--- a/buildtools/autotools/addapplicationdlgbase.ui
+++ b/buildtools/autotools/addapplicationdlgbase.ui
@@ -539,9 +539,6 @@
     <tabstop>okbutton</tabstop>
     <tabstop>cancelbutton</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">addTypeClicked()</slot>
     <slot access="protected">iconClicked()</slot>
@@ -549,4 +546,8 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui
index 5223bd16..8d93cf8f 100644
--- a/buildtools/autotools/addexistingdlgbase.ui
+++ b/buildtools/autotools/addexistingdlgbase.ui
@@ -445,15 +445,11 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
-    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
-    <include location="global" impldecl="in implementation">kprogress.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kprogress.h</includehint>
-    <includehint>ksqueezedtextlabel.h</includehint>
-</includehints>
 </UI>
diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui
index 0d86b1a0..980515e8 100644
--- a/buildtools/autotools/addfiledlgbase.ui
+++ b/buildtools/autotools/addfiledlgbase.ui
@@ -275,15 +275,11 @@
         </widget>
     </grid>
 </widget>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
-    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui
index c0e6c114..354a8f88 100644
--- a/buildtools/autotools/addicondlgbase.ui
+++ b/buildtools/autotools/addicondlgbase.ui
@@ -263,11 +263,11 @@
 <Q_SLOTS>
     <slot>somethingChanged()</slot>
 </Q_SLOTS>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-
 </UI>
 
diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui
index c1f52b22..ad8e1b49 100644
--- a/buildtools/autotools/addservicedlgbase.ui
+++ b/buildtools/autotools/addservicedlgbase.ui
@@ -536,9 +536,10 @@
     <slot access="protected">propertyExecuted(TQListViewItem*)</slot>
     <slot access="protected">removeTypeClicked()</slot>
 </Q_SLOTS>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui
index 3c2e4828..e5483446 100644
--- a/buildtools/autotools/addsubprojectdlgbase.ui
+++ b/buildtools/autotools/addsubprojectdlgbase.ui
@@ -186,13 +186,10 @@
     <tabstop>createButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui
index 9e8b561f..77bb8adc 100644
--- a/buildtools/autotools/addtargetdlgbase.ui
+++ b/buildtools/autotools/addtargetdlgbase.ui
@@ -334,15 +334,14 @@
     <tabstop>okbutton</tabstop>
     <tabstop>cancelbutton</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">primaryChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>ksqueezedtextlabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+</includes>
 </UI>
diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui
index 5419e520..f41dd3d4 100644
--- a/buildtools/autotools/autoprojectviewbase.ui
+++ b/buildtools/autotools/autoprojectviewbase.ui
@@ -117,7 +117,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui
index 6e3d5096..9bcddff0 100644
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@@ -202,9 +202,6 @@
     <tabstop>newFileList</tabstop>
     <tabstop>neverAskAgainCheckbox</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">slotActiveTargetToggled(bool)</slot>
     <slot access="protected">slotChooseTargetToggled(bool)</slot>
@@ -212,11 +209,9 @@
     <slot access="private">slotTargetChanged(const TQString&amp;)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui
index 37ac2407..a8821504 100644
--- a/buildtools/autotools/configureoptionswidgetbase.ui
+++ b/buildtools/autotools/configureoptionswidgetbase.ui
@@ -1014,9 +1014,6 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
     <tabstop>f77flags_edit</tabstop>
     <tabstop>f77flags_button</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">builddirClicked()</slot>
     <slot access="protected">cflagsClicked()</slot>
@@ -1034,7 +1031,8 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui
index b7e918cf..eef378b5 100644
--- a/buildtools/autotools/removetargetdlgbase.ui
+++ b/buildtools/autotools/removetargetdlgbase.ui
@@ -251,14 +251,12 @@
         </widget>
     </grid>
 </widget>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kprogress.h</includehint>
-</includehints>
 </UI>
diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui
index 6c069718..d417e73b 100644
--- a/buildtools/autotools/subprojectoptionsdlgbase.ui
+++ b/buildtools/autotools/subprojectoptionsdlgbase.ui
@@ -964,9 +964,6 @@
     <tabstop>okbutton</tabstop>
     <tabstop>cancelbutton</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">buildorderMoveDownClicked()</slot>
     <slot access="protected">cflagsClicked()</slot>
@@ -986,4 +983,8 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui
index 7e721a42..2fad9db1 100644
--- a/buildtools/autotools/targetoptionsdlgbase.ui
+++ b/buildtools/autotools/targetoptionsdlgbase.ui
@@ -700,9 +700,6 @@
     <tabstop>okbutton</tabstop>
     <tabstop>cancelbutton</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">insideMoveDownClicked()</slot>
     <slot access="protected">insideMoveUpClicked()</slot>
@@ -714,13 +711,9 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
index df063672..bea1e872 100644
--- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
+++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
@@ -147,18 +147,14 @@
         </spacer>
     </vbox>
 </widget>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">makeToggled(bool)</slot>
     <slot access="protected">otherToggled(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
index 3dcdfef7..cae0a6e0 100644
--- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
@@ -375,9 +375,6 @@
     <tabstop>copyenvs_button</tabstop>
     <tabstop>removeenvs_button</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">envNameChanged(const TQString &amp;)</slot>
     <slot access="protected">envChanged(const TQString&amp;)</slot>
@@ -387,9 +384,8 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui
index a141c0b1..59d7873d 100644
--- a/buildtools/custommakefiles/custommanagerwidgetbase.ui
+++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui
@@ -67,8 +67,7 @@ This will be used when adding/removing files in directories and re-populating th
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">keditlistbox.h</include>
+</includes>
 </UI>
diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
index d56df24b..5b0aa432 100644
--- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui
+++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
@@ -44,7 +44,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
index eb2903ac..5deda025 100644
--- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui
+++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
@@ -105,7 +105,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui
index 9caba3ee..2311ca55 100644
--- a/buildtools/lib/widgets/makeoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui
@@ -186,9 +186,10 @@
     <tabstop>makebin_edit</tabstop>
     <tabstop>jobs_box</tabstop>
 </tabstops>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui
index 3243c178..404af030 100644
--- a/buildtools/lib/widgets/runoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/runoptionswidgetbase.ui
@@ -235,23 +235,15 @@
     <tabstop>startinterminal_box</tabstop>
     <tabstop>autocompile_box</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
-</includes>
 <Q_SLOTS>
     <slot>mainProgramChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index 7a06defb..a87cbd34 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -205,9 +205,6 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">changeCurrentURL(const TQString &amp;str)</slot>
     <slot access="protected">removeRelation()</slot>
@@ -216,9 +213,8 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui
index a7c7b418..a6f9321c 100644
--- a/buildtools/pascal/pascalproject_optionsdlgbase.ui
+++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui
@@ -450,9 +450,6 @@
     <tabstop>addconfig_button</tabstop>
     <tabstop>removeconfig_button</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">compiler_box_activated(const TQString&amp;)</slot>
     <slot access="protected">addconfig_button_clicked()</slot>
@@ -466,9 +463,8 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui
index e9ef33f5..854966b3 100644
--- a/buildtools/qmake/choosesubprojectdlgbase.ui
+++ b/buildtools/qmake/choosesubprojectdlgbase.ui
@@ -127,8 +127,8 @@
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui
index d1550092..09b265d9 100644
--- a/buildtools/qmake/createscopedlgbase.ui
+++ b/buildtools/qmake/createscopedlgbase.ui
@@ -317,13 +317,9 @@
     <tabstop>checkNotInc</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui
index 863e28f8..2adc1544 100644
--- a/buildtools/qmake/disablesubprojectdlgbase.ui
+++ b/buildtools/qmake/disablesubprojectdlgbase.ui
@@ -118,9 +118,8 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui
index 243fbff3..84d552b2 100644
--- a/buildtools/qmake/newwidgetdlgbase.ui
+++ b/buildtools/qmake/newwidgetdlgbase.ui
@@ -216,14 +216,15 @@
     <tabstop>okayButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
 <Q_SLOTS>
     <slot>subclassingPressed()</slot>
     <slot>templateSelChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index 0427a730..686240fe 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -2786,11 +2786,6 @@
     <tabstop>buttonApply</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
 <Q_SLOTS>
     <slot>updateProjectConfiguration()</slot>
     <slot>buildorderMoveUpClicked()</slot>
@@ -2838,60 +2833,13 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui
index 1ae7a808..31fdccac 100644
--- a/buildtools/qmake/qmakeoptionswidgetbase.ui
+++ b/buildtools/qmake/qmakeoptionswidgetbase.ui
@@ -209,9 +209,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string>
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui
index c23e3941..8cfe4f72 100644
--- a/buildtools/script/scriptoptionswidgetbase.ui
+++ b/buildtools/script/scriptoptionswidgetbase.ui
@@ -147,9 +147,10 @@
         </spacer>
     </vbox>
 </widget>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
-- 
cgit v1.2.1