diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2018-09-23 13:07:23 +0200 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-23 23:48:57 +0900 |
commit | 3aadeebb36ac178c7b5cf7f91fd5f2a269d4a21c (patch) | |
tree | 3398739e53968bdcabb53761d9498b7d3a0d701f /buildtools/autotools | |
parent | 319590c0d02bcea8b7860514383ea33f2c6a0cdf (diff) | |
download | tdevelop-3aadeebb36ac178c7b5cf7f91fd5f2a269d4a21c.tar.gz tdevelop-3aadeebb36ac178c7b5cf7f91fd5f2a269d4a21c.zip |
Add includes to UI files to resolve FTBFS
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a213def8e9bf36d3554373e623a8e84ef46ad960)
Diffstat (limited to 'buildtools/autotools')
-rw-r--r-- | buildtools/autotools/addapplicationdlgbase.ui | 7 | ||||
-rw-r--r-- | buildtools/autotools/addexistingdlgbase.ui | 12 | ||||
-rw-r--r-- | buildtools/autotools/addfiledlgbase.ui | 12 | ||||
-rw-r--r-- | buildtools/autotools/addicondlgbase.ui | 6 | ||||
-rw-r--r-- | buildtools/autotools/addservicedlgbase.ui | 5 | ||||
-rw-r--r-- | buildtools/autotools/addsubprojectdlgbase.ui | 9 | ||||
-rw-r--r-- | buildtools/autotools/addtargetdlgbase.ui | 11 | ||||
-rw-r--r-- | buildtools/autotools/autoprojectviewbase.ui | 6 | ||||
-rw-r--r-- | buildtools/autotools/choosetargetdlgbase.ui | 15 | ||||
-rw-r--r-- | buildtools/autotools/configureoptionswidgetbase.ui | 10 | ||||
-rw-r--r-- | buildtools/autotools/removetargetdlgbase.ui | 12 | ||||
-rw-r--r-- | buildtools/autotools/subprojectoptionsdlgbase.ui | 7 | ||||
-rw-r--r-- | buildtools/autotools/targetoptionsdlgbase.ui | 17 |
13 files changed, 52 insertions, 77 deletions
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&)</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 <include dir></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 <include dir></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> |