diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-08-20 17:16:06 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-08-20 17:16:06 +0200 |
| commit | da9871c3ce2d7ca4efbc40c2d55d08c6b13834cc (patch) | |
| tree | 71c02cd760f41c9f4cf0b89a402abcf2c706c220 | |
| parent | 2e44e8134b077032341849886e2aad465cee1fd9 (diff) | |
do not make Qt3 moc mix KDE3 and TDE slots
Qt3 moc does not understand #ifdef, so filter out unwanted stuff for it.
| -rw-r--r-- | vcl/CustomTarget_kde_moc.mk | 2 | ||||
| -rw-r--r-- | vcl/CustomTarget_tde_moc.mk | 2 | ||||
| -rw-r--r-- | vcl/unx/kde/fpicker/kdefilepicker.hxx | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk index d0c26e2e6858..5ec2a359f1bd 100644 --- a/vcl/CustomTarget_kde_moc.mk +++ b/vcl/CustomTarget_kde_moc.mk @@ -34,6 +34,6 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\ $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \ | $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) - $(MOC) -o $@ $< + cat $< | grep -v 'FILTER_OUT_TDE' | $(MOC) -o $@ -f$< # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/vcl/CustomTarget_tde_moc.mk b/vcl/CustomTarget_tde_moc.mk index d0c26e2e6858..78c3b4ba39e1 100644 --- a/vcl/CustomTarget_tde_moc.mk +++ b/vcl/CustomTarget_tde_moc.mk @@ -34,6 +34,6 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\ $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \ | $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) - $(MOC) -o $@ $< + cat $< | grep -v 'FILTER_OUT_KDE' | $(MOC) -o $@ -f$< # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx index ed7eef3923bf..57ac7b64f06b 100644 --- a/vcl/unx/kde/fpicker/kdefilepicker.hxx +++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx @@ -114,10 +114,12 @@ protected: bool canNotifySelection( void ) const { return m_bCanNotifySelection; } protected slots: +// Qt3 moc does not really understand #ifdef and would process both slots, +// so the FILTER_OUT_FOO tags are used to remove some slots before moc sees them. #ifdef ENABLE_TDE - void fileHighlightedCommand( const TQString & ); + void fileHighlightedCommand( const TQString & ); // FILTER_OUT_TDE #else // ENABLE_TDE - void fileHighlightedCommand( const QString & ); + void fileHighlightedCommand( const QString & ); // FILTER_OUT_KDE #endif // ENABLE_TDE void selectionChangedCommand(); |