]> git.sesse.net Git - vlc/commitdiff
qt4: Define Q_DECL_OVERRIDE for Qt4
authorUwe L. Korn <uwelk@xhochy.com>
Fri, 15 Aug 2014 08:40:04 +0000 (08:40 +0000)
committerTristan Matthews <le.businessman@gmail.com>
Wed, 3 Sep 2014 01:22:42 +0000 (21:22 -0400)
Signed-off-by: Tristan Matthews <le.businessman@gmail.com>
modules/gui/qt4/qt4.hpp

index 44d7db657403d85ae4dfd3d742d84007533f35ac..624476381c16182147377bcd56eb2671a72d380a 100644 (file)
 #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,