[vlc-commits] Qt: Do not use Q_DECL_OVERRIDE macro with qt4

[Gilles Sabourin]

vlc/vlc-2.2 | branch: master | Gilles Sabourin <gilles.sabourin at free.fr> | Sat Dec 17 15:38:08 2016 +0100| [c48acd16019c5fe9cb97e8bfd4cacb8a3a01dd78] | committer: Hugo Beauzée-Luyssen

Qt: Do not use Q_DECL_OVERRIDE macro with qt4

	Warning: this patch should only be applied to 2.2 maintenance branch
	since Q_DECL_OVERRIDE macro was introduced in Qt 5.0

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c48acd16019c5fe9cb97e8bfd4cacb8a3a01dd78
---

 modules/gui/qt4/dialogs/epg.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/dialogs/epg.hpp b/modules/gui/qt4/dialogs/epg.hpp
index 10c3ff1..9efabbb 100644
--- a/modules/gui/qt4/dialogs/epg.hpp
+++ b/modules/gui/qt4/dialogs/epg.hpp
@@ -37,7 +37,7 @@ class EpgDialog : public QVLCFrame, public Singleton<EpgDialog>
 {
     Q_OBJECT
 protected:
-    virtual void showEvent(QShowEvent * event) Q_DECL_OVERRIDE;
+    virtual void showEvent(QShowEvent * event);
 
 private:
     EpgDialog( intf_thread_t * );