diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-21 15:57:05 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-21 15:57:05 +0900 |
| commit | b4a5c0a167522ed4aa987fb1d65e6b58333b1363 (patch) | |
| tree | 55a3c1bbeb771e16d631b916b75625eb96add9ed /kcontrol/kicker | |
| parent | 1bd64002944c6b6ec17f44066573e3c8e5b69cdf (diff) | |
| download | tdebase-b4a5c0a167522ed4aa987fb1d65e6b58333b1363.tar.gz tdebase-b4a5c0a167522ed4aa987fb1d65e6b58333b1363.zip | |
Add includes to UI files to resolve FTBFS.
Partially cherry-picked from 661ed658.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kcontrol/kicker')
| -rw-r--r-- | kcontrol/kicker/advancedOptions.ui | 7 | ||||
| -rw-r--r-- | kcontrol/kicker/lookandfeeltab.ui | 12 | ||||
| -rw-r--r-- | kcontrol/kicker/menutab.ui | 10 |
3 files changed, 7 insertions, 22 deletions
diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index 5ba10dd75..23f004925 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -355,13 +355,10 @@ <tabstop>tintSlider</tabstop> </tabstops> <includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in declaration">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 522548f40..7938f5f6c 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -617,6 +617,7 @@ This option is only active if 'Enable background image' is selected.</string> <tabstop>advancedOptionsButton</tabstop> </tabstops> <includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in declaration">kcombobox.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> @@ -629,17 +630,6 @@ This option is only active if 'Enable background image' is selected.</string> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index 5d3f8fcfe..2614a278a 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -729,14 +729,12 @@ <tabstop>kcfg_NumVisibleEntries</tabstop> </tabstops> <includes> - <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> - <includehints> - <includehint>tdelistview.h</includehint> - <includehint>knuminput.h</includehint> - </includehints> </UI> |