status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not include Qt QML headers when not building for QML. (#146) 

This fixes building without the qzxing_qml config option on systems
without the Qt QML headers (e.g. where Qt has been manually built
without the qtdeclarative module).
This commit is contained in:
JamesAtChamSys 2019-12-12 07:36:53 +00:00 committed by Nikolaos Ftylitakis
parent bbd6f2a56c
commit 1b10ebf2ea
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/QZXing.cpp
View File

@ -21,17 +21,17 @@
#include <zxing/qrcode/ErrorCorrectionLevel.h>
#endif // ENABLE_ENCODER_QR_CODE
#ifdef QZXING_MULTIMEDIA
#include "QZXingFilter.h"
#endif //QZXING_MULTIMEDIA
#ifdef QZXING_QML
#if QT_VERSION >= 0x040700 && QT_VERSION < 0x050000
#include <QtDeclarative>
#elif QT_VERSION >= 0x050000
#include <QtQml/qqml.h>
#endif
#ifdef QZXING_MULTIMEDIA
#include "QZXingFilter.h"
#endif //QZXING_MULTIMEDIA
#ifdef QZXING_QML
#include <QQmlEngine>
#include <QQmlContext>
#include <QQuickImageProvider>