[vlc-commits] Qt: add support for QtSVG

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Thu Oct 12 23:57:57 2017 +0200| [25751de829d4169e109ad60247e8aa02c7931b73] | committer: Jean-Baptiste Kempf

Qt: add support for QtSVG

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 configure.ac          | 2 +-
 modules/gui/qt/qt.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f342b328da..19f80b8608 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3655,7 +3655,7 @@ AC_ARG_ENABLE(qt, [
 ])
 have_qt5_x11="no"
 AS_IF([test "${enable_qt}" != "no"], [
-  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.2.0 Qt5Widgets Qt5Gui], [
+  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.6.0 Qt5Widgets Qt5Gui Qt5Svg], [
       PKG_CHECK_MODULES([QT5_X11], [Qt5X11Extras], [
           have_qt5_x11="yes"
       ],[
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index f521d04171..914671aa1e 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -56,6 +56,8 @@
  #if HAS_QT5
   #ifdef QT_STATICPLUGIN
    Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+   Q_IMPORT_PLUGIN(QSvgIconPlugin)
+   Q_IMPORT_PLUGIN(QSvgPlugin)
    #if !HAS_QT56
     Q_IMPORT_PLUGIN(AccessibleFactory)
    #endif