[vlc-commits] qt4: Define Q_DECL_OVERRIDE for Qt4

[Uwe L. Korn]

vlc | branch: master | Uwe L. Korn <uwelk at xhochy.com> | Fri Aug 15 08:40:04 2014 +0000| [6aaf1e0cce4979efdfd01d9ee375a7e7b730ea11] | committer: Tristan Matthews

qt4: Define Q_DECL_OVERRIDE for Qt4

Signed-off-by: Tristan Matthews <le.businessman at gmail.com>

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

 modules/gui/qt4/qt4.hpp |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 44d7db6..6244763 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -43,6 +43,11 @@
 #define HAS_QT47 ( QT_VERSION >= 0x040700 )
 #define HAS_QT5  ( QT_VERSION >= 0x050000 )
 
+/* Q_DECL_OVERRIDE is a Qt5 feature, add empty define to not break with Qt4 */
+#if !HAS_QT5 && !defined(Q_DECL_OVERRIDE)
+# define Q_DECL_OVERRIDE
+#endif
+
 enum {
     DialogEventTypeOffset = 0,
     IMEventTypeOffset     = 100,