[vlc-commits] Qt: accessible widgets is part of Qt5Gui in 5.6

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Mar 18 15:02:42 2016 +0100| [803e5eb1c2eaeed5d1cc8c18890a899e4e213057] | committer: Jean-Baptiste Kempf

Qt: accessible widgets is part of Qt5Gui in 5.6

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

 modules/gui/qt/qt.cpp |    4 +++-
 modules/gui/qt/qt.hpp |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index e128bc4..75e2f50 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -56,7 +56,9 @@
  #if HAS_QT5
   #ifdef QT_STATICPLUGIN
    Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
-   Q_IMPORT_PLUGIN(AccessibleFactory)
+   #if !HAS_QT56
+    Q_IMPORT_PLUGIN(AccessibleFactory)
+   #endif
   #endif
  #else
   Q_IMPORT_PLUGIN(qjpeg)
diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp
index b07f962..c6aadeb 100644
--- a/modules/gui/qt/qt.hpp
+++ b/modules/gui/qt/qt.hpp
@@ -48,6 +48,7 @@
 
 #define HAS_QT47 ( QT_VERSION >= 0x040700 )
 #define HAS_QT5  ( QT_VERSION >= 0x050000 )
+#define HAS_QT56 ( QT_VERSION >= 0x050600 )
 
 /* Q_DECL_OVERRIDE is a Qt5 feature, add empty define to not break with Qt4 */
 #if !HAS_QT5 && !defined(Q_DECL_OVERRIDE)