mirror of
https://github.com/status-im/qzxing.git
synced 2025-02-16 12:58:31 +00:00
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:
parent
bbd6f2a56c
commit
1b10ebf2ea
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user