vlc | branch: master | Martell Malone <[email protected]> | Tue Nov 25 13:23:38 2014 +0000| [98ada626762841b5976ca71166fd2b4b970f19ea] | committer: Jean-Baptiste Kempf
Qt: add QT_STATICPLUGIN define as per the qt spec The QT spec says we should use QT_STATICPLUGIN defined if building a static plugin. As we are using out own makefile and not a qt .pro project we have to define it ourselves. This is then used to decide if we should import the modules QWindowsIntegrationPlugin and AccessibleFactory as these are not needed on a shared build. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=98ada626762841b5976ca71166fd2b4b970f19ea --- modules/gui/qt4/qt4.cpp | 6 ++++-- modules/gui/qt4/qt4.hpp | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 1e25371..b6aef43 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -52,8 +52,10 @@ #ifdef _WIN32 /* For static builds */ #include <QtPlugin> #if HAS_QT5 - Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) - Q_IMPORT_PLUGIN(AccessibleFactory) + #ifdef QT_STATICPLUGIN + Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) + Q_IMPORT_PLUGIN(AccessibleFactory) + #endif #else Q_IMPORT_PLUGIN(qjpeg) Q_IMPORT_PLUGIN(qtaccessiblewidgets) diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp index 6244763..1db035a 100644 --- a/modules/gui/qt4/qt4.hpp +++ b/modules/gui/qt4/qt4.hpp @@ -33,6 +33,12 @@ #include <vlc_interface.h> /* intf_thread_t */ #include <vlc_playlist.h> /* playlist_t */ +#include <qconfig.h> + +#ifdef QT_STATIC +#define QT_STATICPLUGIN +#endif + #define QT_NO_CAST_TO_ASCII #include <QString> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
