[vlc-commits] qt: Don't assume static builds to be on win32 only

Hugo Beauzée-Luyssen git at videolan.org
Mon Oct 15 15:54:51 CEST 2018


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Oct 10 15:24:12 2018 +0200| [e6c60c85d077e021ba0908b36436a343815830f8] | committer: Hugo Beauzée-Luyssen

qt: Don't assume static builds to be on win32 only

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

 modules/gui/qt/qt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index cde1134f9c..c7c6ee24d0 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -63,11 +63,10 @@ extern "C" char **environ;
 #include <vlc_plugin.h>
 #include <vlc_vout_window.h>
 
-#ifdef _WIN32 /* For static builds */
+#ifdef QT_STATIC /* For static builds */
  #include <QtPlugin>
 
  #ifdef QT_STATICPLUGIN
-  Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
   Q_IMPORT_PLUGIN(QSvgIconPlugin)
   Q_IMPORT_PLUGIN(QSvgPlugin)
   #if !HAS_QT56
@@ -75,6 +74,7 @@ extern "C" char **environ;
   #endif
   #ifdef _WIN32
    Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
+   Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
   #endif
  #endif
 #endif



More information about the vlc-commits mailing list