[vlc-devel] [PATCH 1/3] qt4: Define Q_DECL_OVERRIDE for Qt4

Uwe L. Korn uwelk at xhochy.com
Thu Aug 14 17:42:42 CEST 2014


---
 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..cc6e521 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 !defined(HAS_QT5) && !defined(Q_DECL_OVERRIDE)
+# define Q_DECL_OVERRIDE
+#endif
+
 enum {
     DialogEventTypeOffset = 0,
     IMEventTypeOffset     = 100,
-- 
2.0.4




More information about the vlc-devel mailing list