[vlc-commits] [Git][videolan/vlc][master] qt: use correct define for static Qt lib check

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
80489c82 by Johannes Kauffmann at 2022-10-07T13:34:54+00:00
qt: use correct define for static Qt lib check

QT_STATICPLUGIN is meant for building a static Qt plugin [1], and not for
testing if the used Qt is a static or shared build: That should be done
with QT_STATIC. Since we are not building a static Qt plugin, use
QT_STATIC.

1. https://doc.qt.io/qt-5/plugins-howto.html#creating-static-plugins

- - - - -


2 changed files:

- modules/gui/qt/maininterface/mainui.cpp
- modules/gui/qt/qt.hpp


Changes:

=====================================
modules/gui/qt/maininterface/mainui.cpp
=====================================
@@ -177,7 +177,7 @@ bool MainUI::setup(QQmlEngine* engine)
     {
         for(auto& error: m_component->errors())
             msg_Err(m_intf, "qml loading %s %s:%u", qtu(error.description()), qtu(error.url().toString()), error.line());
-#ifdef QT_STATICPLUGIN
+#ifdef QT_STATIC
             assert( !"Missing qml modules from qt contribs." );
 #else
             msg_Err( m_intf, "Install missing modules using your packaging tool" );


=====================================
modules/gui/qt/qt.hpp
=====================================
@@ -33,10 +33,6 @@
 
 #include <qconfig.h>
 
-#ifdef QT_STATIC
-#define QT_STATICPLUGIN
-#endif
-
 #define QT_NO_CAST_TO_ASCII
 #include <QString>
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/80489c822c7f6f973780bdc9b24e9137c8b6be1c

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/80489c822c7f6f973780bdc9b24e9137c8b6be1c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance