Disable methods to register QMLtypes if QZXing is build as lib + qml

Thaodan · Thaodan · commit 77824c89fb6a · 2019-04-16T11:47:19.000+02:00
diff --git a/src/QZXing.cpp b/src/QZXing.cpp
@@ -79,6 +79,8 @@ QZXing::QZXing(QZXing::DecoderFormat decodeHints, QObject *parent) : QObject(par
 
 #ifdef QZXING_QML
 
+#ifndef DISABLE_LIBRARY_FEATURES
+
 #if QT_VERSION >= 0x040700
 void QZXing::registerQMLTypes()
 {
@@ -98,6 +100,8 @@ void QZXing::registerQMLImageProvider(QQmlEngine& engine)
 }
 #endif //QT_VERSION >= Qt 5.0
 
+#endif // DISABLE_LIBRARY_FEATURES
+
 #endif //QZXING_QML
 
 void QZXing::setTryHarder(bool tryHarder)

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ QZXing::QZXing(QZXing::DecoderFormat decodeHints, QObject *parent) : QObject(par`
`79`	`79`
`80`	`80`	`#ifdef QZXING_QML`
`81`	`81`
	`82`	`+#ifndef DISABLE_LIBRARY_FEATURES`
	`83`	`+`
`82`	`84`	`#if QT_VERSION >= 0x040700`
`83`	`85`	`void QZXing::registerQMLTypes()`
`84`	`86`	`{`
`@@ -98,6 +100,8 @@ void QZXing::registerQMLImageProvider(QQmlEngine& engine)`
`98`	`100`	`}`
`99`	`101`	`#endif //QT_VERSION >= Qt 5.0`
`100`	`102`
	`103`	`+#endif // DISABLE_LIBRARY_FEATURES`
	`104`	`+`
`101`	`105`	`#endif //QZXING_QML`
`102`	`106`
`103`	`107`	`void QZXing::setTryHarder(bool tryHarder)`