From 3aadeebb36ac178c7b5cf7f91fd5f2a269d4a21c 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>
(cherry picked from commit a213def8e9bf36d3554373e623a8e84ef46ad960)
---
 .../lib/widgets/environmentdisplaydialogbase.ui      |  6 +++---
 buildtools/lib/widgets/makeoptionswidgetbase.ui      |  5 +++--
 buildtools/lib/widgets/runoptionswidgetbase.ui       | 20 ++++++--------------
 buildtools/lib/widgets/subclassesdlgbase.ui          | 12 ++++--------
 4 files changed, 16 insertions(+), 27 deletions(-)

(limited to 'buildtools/lib')

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>
-- 
cgit v1.2.3