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)
---
 buildtools/custommakefiles/custombuildoptionswidgetbase.ui | 12 ++++--------
 buildtools/custommakefiles/custommakeconfigwidgetbase.ui   | 12 ++++--------
 buildtools/custommakefiles/custommanagerwidgetbase.ui      |  7 +++----
 buildtools/custommakefiles/selectnewfilesdialogbase.ui     |  6 +++---
 4 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'buildtools/custommakefiles')

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