qt 3.3.5 uic does weird things with hints. Patch taken from FreeBSD.

This commit is contained in:
espie 2005-09-19 14:05:37 +00:00
parent fc72b96a74
commit 583aad18f0
32 changed files with 389 additions and 0 deletions

View File

@ -0,0 +1,10 @@
--- khotkeys/kcontrol/ui/actions_listview_widget_ui.ui.orig Thu Sep 15 12:55:58 2005
+++ khotkeys/kcontrol/ui/actions_listview_widget_ui.ui Thu Sep 15 12:56:06 2005
@@ -80,7 +80,4 @@
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>khotkeys::actions_listview.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,12 @@
--- kstars/kstars/tools/altvstimeui.ui.orig Thu Sep 15 18:46:02 2005
+++ kstars/kstars/tools/altvstimeui.ui Thu Sep 15 18:46:13 2005
@@ -529,9 +529,5 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>extdateedit.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kstars/kstars/tools/argsetlocaltime.ui.orig Thu Sep 15 18:44:35 2005
+++ kstars/kstars/tools/argsetlocaltime.ui Thu Sep 15 18:44:43 2005
@@ -102,7 +102,4 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>extdatewidget.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,16 @@
--- kstars/kstars/tools/modcalcapcoorddlg.ui.orig Thu Sep 15 18:43:01 2005
+++ kstars/kstars/tools/modcalcapcoorddlg.ui Thu Sep 15 18:43:22 2005
@@ -853,13 +853,6 @@
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>extdateedit.h</includehint>
<includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>extdateedit.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,22 @@
--- kstars/kstars/tools/modcalcazeldlg.ui.orig Thu Sep 15 18:42:01 2005
+++ kstars/kstars/tools/modcalcazeldlg.ui Thu Sep 15 18:42:16 2005
@@ -1019,19 +1019,6 @@
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>extdateedit.h</includehint>
<includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>extdateedit.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,17 @@
--- kstars/kstars/tools/modcalcdaylengthdlg.ui.orig Thu Sep 15 18:40:46 2005
+++ kstars/kstars/tools/modcalcdaylengthdlg.ui Thu Sep 15 18:41:10 2005
@@ -638,14 +638,6 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>extdateedit.h</includehint>
<includehint>timebox.h</includehint>
- <includehint>timebox.h</includehint>
- <includehint>timebox.h</includehint>
- <includehint>timebox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kstars/kstars/tools/modcalcequinoxdlg.ui.orig Thu Sep 15 18:39:46 2005
+++ kstars/kstars/tools/modcalcequinoxdlg.ui Thu Sep 15 18:40:01 2005
@@ -563,7 +563,4 @@
<slot>slotRunBatch()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>extdatetimeedit.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kstars/kstars/tools/modcalcjddlg.ui.orig Thu Sep 15 18:38:29 2005
+++ kstars/kstars/tools/modcalcjddlg.ui Thu Sep 15 18:38:39 2005
@@ -537,7 +537,4 @@
<slot>showCurrentTime()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>extdateedit.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,22 @@
--- kstars/kstars/tools/modcalcplanetsdlg.ui.orig Thu Sep 15 18:37:06 2005
+++ kstars/kstars/tools/modcalcplanetsdlg.ui Thu Sep 15 18:37:32 2005
@@ -1332,19 +1332,6 @@
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>extdateedit.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>extdateedit.h</includehint>
<includehint>dmsbox.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- kstars/kstars/tools/modcalcsidtimedlg.ui.orig Thu Sep 15 18:35:28 2005
+++ kstars/kstars/tools/modcalcsidtimedlg.ui Thu Sep 15 18:36:04 2005
@@ -830,8 +830,5 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>dmsbox.h</includehint>
- <includehint>extdateedit.h</includehint>
- <includehint>dmsbox.h</includehint>
- <includehint>extdateedit.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- kstars/kstars/tools/planetviewerui.ui.orig Thu Sep 15 12:49:16 2005
+++ kstars/kstars/tools/planetviewerui.ui Thu Sep 15 12:49:56 2005
@@ -145,8 +145,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>pvplotwidget.h</includehint>
<includehint>timestepbox.h</includehint>
- <includehint>extdateedit.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- ksnapshot/ksnapshotwidget.ui.orig Thu Sep 15 12:46:22 2005
+++ ksnapshot/ksnapshotwidget.ui Thu Sep 15 12:46:29 2005
@@ -342,7 +342,6 @@
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>ksnapshotpreview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

View File

@ -0,0 +1,12 @@
--- kviewshell/pageSizeWidget_base.ui.orig Thu Sep 15 19:05:14 2005
+++ kviewshell/pageSizeWidget_base.ui Thu Sep 15 19:05:36 2005
@@ -281,9 +281,5 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>sizepreview.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- kopete/protocols/gadu/ui/gadueditaccountui.ui.orig Thu Sep 15 19:02:36 2005
+++ kopete/protocols/gadu/ui/gadueditaccountui.ui Thu Sep 15 19:03:04 2005
@@ -661,8 +661,6 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
- <includehint>kopete::ui::passwordwidget.h</includehint>
- <includehint>klineedit.h</includehint>
<includehint>krestrictedline.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kopete/protocols/groupwise/ui/gwaccountpreferences.ui.orig Thu Sep 15 19:01:41 2005
+++ kopete/protocols/groupwise/ui/gwaccountpreferences.ui Thu Sep 15 19:01:46 2005
@@ -320,7 +320,4 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kopete::ui::passwordwidget.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kopete/protocols/irc/ui/ircadd.ui.orig Thu Sep 15 19:00:31 2005
+++ kopete/protocols/irc/ui/ircadd.ui Thu Sep 15 19:00:38 2005
@@ -160,7 +160,4 @@
<tabstop>tabWidget3</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>mycustomwidget.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- kopete/protocols/irc/ui/irceditaccount.ui.orig Thu Sep 15 18:59:16 2005
+++ kopete/protocols/irc/ui/irceditaccount.ui Thu Sep 15 18:59:28 2005
@@ -1020,8 +1020,6 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kopete::ui::passwordwidget.h</includehint>
- <includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui.orig Thu Sep 15 18:57:02 2005
+++ kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui Thu Sep 15 18:57:49 2005
@@ -717,7 +717,4 @@
<tabstop>leProxyJID</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kopete::ui::passwordwidget.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kopete/protocols/oscar/aim/ui/aimeditaccountui.ui.orig Thu Sep 15 18:55:18 2005
+++ kopete/protocols/oscar/aim/ui/aimeditaccountui.ui Thu Sep 15 18:55:28 2005
@@ -406,7 +406,4 @@
<tabstop>sbxServerPort</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kopete::ui::passwordwidget.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- kopete/protocols/oscar/icq/ui/icqeditaccountui.ui.orig Thu Sep 15 18:54:01 2005
+++ kopete/protocols/oscar/icq/ui/icqeditaccountui.ui Thu Sep 15 18:54:08 2005
@@ -450,7 +450,4 @@
<tabstop>chkWebAware</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kopete::ui::passwordwidget.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,23 @@
--- kpresenter/imageEffectBase.ui.orig Fri Sep 16 18:02:09 2005
+++ kpresenter/imageEffectBase.ui Fri Sep 16 18:02:24 2005
@@ -1461,20 +1461,5 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig Thu Sep 15 12:38:33 2005
+++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui Thu Sep 15 12:38:52 2005
@@ -265,7 +265,4 @@
<tabstop>radioPerceptual</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kiscmbidlist.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui.orig Thu Sep 15 12:36:52 2005
+++ krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui Thu Sep 15 12:37:07 2005
@@ -186,7 +186,4 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kismatrixwidget.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- krita/plugins/screenshot/ksnapshotwidget.ui.orig Thu Sep 15 12:30:37 2005
+++ krita/plugins/screenshot/ksnapshotwidget.ui Thu Sep 15 12:30:56 2005
@@ -332,7 +332,4 @@
<pixmapfunction>SmallIconSet</pixmapfunction>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>ksnapshotthumb.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- krita/ui/kis_previewwidgetbase.ui.orig Thu Sep 15 18:26:35 2005
+++ krita/ui/kis_previewwidgetbase.ui Thu Sep 15 18:26:43 2005
@@ -201,8 +201,4 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kispreviewview.h</includehint>
- <includehint>kispreviewview.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- krita/ui/wdgcolorsettings.ui.orig Thu Sep 15 18:25:18 2005
+++ krita/ui/wdgcolorsettings.ui Thu Sep 15 18:25:26 2005
@@ -361,8 +361,4 @@
<tabstop>radioPerceptual</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kiscmbidlist.h</includehint>
- <includehint>kiscmbidlist.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- krita/ui/wdglayerbox.ui.orig Thu Sep 15 21:07:24 2005
+++ krita/ui/wdglayerbox.ui Thu Sep 15 21:09:24 2005
@@ -250,8 +250,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kiscmbcomposite.h</includehint>
- <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>klistbox.h</includehint>
</includehints>

View File

@ -0,0 +1,11 @@
--- krita/ui/wdgnewimage.ui.orig Thu Sep 15 18:22:50 2005
+++ krita/ui/wdgnewimage.ui Thu Sep 15 18:23:08 2005
@@ -319,8 +319,6 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>kiscmbidlist.h</includehint>
<includehint>kcolorcombo.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,11 @@
--- krita/ui/widgets/kis_wdg_autogradient.ui.orig Thu Sep 15 12:28:25 2005
+++ krita/ui/widgets/kis_wdg_autogradient.ui Thu Sep 15 12:28:43 2005
@@ -406,8 +406,6 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kisgradientsliderwidget.h</includehint>
- <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,10 @@
--- korn/kornboxcfg.ui.orig Thu Sep 15 12:20:01 2005
+++ korn/kornboxcfg.ui Thu Sep 15 12:21:14 2005
@@ -1692,7 +1692,6 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>keditlistboxmanager.h</includehint>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>

View File

@ -0,0 +1,10 @@
--- korn/korncfg.ui.orig Thu Sep 15 12:21:41 2005
+++ korn/korncfg.ui Thu Sep 15 12:22:00 2005
@@ -162,7 +162,4 @@
<slot access="protected">slotEditBox()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>keditlistboxmanager.h</includehint>
-</includehints>
</UI>

View File

@ -0,0 +1,16 @@
--- umbrello/umbrello/dialogs/codevieweroptionsbase.ui.orig Thu Sep 15 21:46:21 2005
+++ umbrello/umbrello/dialogs/codevieweroptionsbase.ui Thu Sep 15 21:46:42 2005
@@ -364,13 +364,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kfontchooser.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
</includehints>
</UI>