Skip to content
Snippets Groups Projects
Commit 80489c82 authored by Johannes Kauffmann's avatar Johannes Kauffmann Committed by Steve Lhomme
Browse files

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
parent 81192e6b
No related branches found
No related tags found
1 merge request!2647qt: use correct define for static Qt lib check
Pipeline #270359 passed with stage
in 18 minutes and 32 seconds
......@@ -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" );
......
......@@ -33,10 +33,6 @@
#include <qconfig.h>
#ifdef QT_STATIC
#define QT_STATICPLUGIN
#endif
#define QT_NO_CAST_TO_ASCII
#include <QString>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment