[vlc-devel] [vlc-commits] Qt: fix compilation with qt4

[Hugo Beauzée-Luyssen]

On 10/29/2015 10:50 AM, Jean-Baptiste Kempf wrote:
> vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 29 10:50:11 2015 +0100| [e938f21ccaa8a5f842351eebaa0f8c635d72c7e8] | committer: Jean-Baptiste Kempf
>
> Qt: fix compilation with qt4
>
>> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e938f21ccaa8a5f842351eebaa0f8c635d72c7e8
> ---
>
>   modules/gui/qt4/dialogs/plugins.hpp |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/modules/gui/qt4/dialogs/plugins.hpp b/modules/gui/qt4/dialogs/plugins.hpp
> index 91bc94e..26ee90a 100644
> --- a/modules/gui/qt4/dialogs/plugins.hpp
> +++ b/modules/gui/qt4/dialogs/plugins.hpp
> @@ -131,7 +131,7 @@ class AddonsTab : public QVLCFrame
>       friend class PluginDialog;
>
>   protected:
> -    void keyPressEvent( QKeyEvent *keyEvent ) Q_DECL_OVERRIDE;
> +    void keyPressEvent( QKeyEvent *keyEvent );
>
>   private slots:
>       void moreInformation();
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits
>

Shouldn't you include qt4.hpp to have the Q_DECL_OVERRIDE "failover" 
define instead?
Also, we probably should have a "#define Q_DECL_OVERRIDE override" when 
building in C++11

Regards,