diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-27 21:23:21 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-27 21:23:21 +0200 |
| commit | 508b512c450529e38b58f2bd46814fa292cc4771 (patch) | |
| tree | 0bbffcbe0c399ac23b9ae48da6374e2432a8d2e3 /src/QR-Code-scanner | |
| parent | b1d24f8aa779953ece9a16c3fdfafbd85a302d34 (diff) | |
| parent | 716010a8698162404ee72c264a33af0a7c5f3be7 (diff) | |
| download | monzero-gui-508b512c450529e38b58f2bd46814fa292cc4771.tar.gz monzero-gui-508b512c450529e38b58f2bd46814fa292cc4771.tar.xz monzero-gui-508b512c450529e38b58f2bd46814fa292cc4771.zip | |
Merge pull request #616
716010a README: QtMultimedia dependency optional (MoroccanMalinois)
fb3a618 Make QtMultimedia dependency optional (MoroccanMalinois)
Diffstat (limited to 'src/QR-Code-scanner')
| -rw-r--r-- | src/QR-Code-scanner/QrCodeScanner.cpp | 4 | ||||
| -rw-r--r-- | src/QR-Code-scanner/QrCodeScanner.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/QR-Code-scanner/QrCodeScanner.cpp b/src/QR-Code-scanner/QrCodeScanner.cpp index 94102429..1129e986 100644 --- a/src/QR-Code-scanner/QrCodeScanner.cpp +++ b/src/QR-Code-scanner/QrCodeScanner.cpp @@ -37,14 +37,12 @@ QrCodeScanner::QrCodeScanner(QObject *parent) , m_processInterval(750) , m_enabled(true) { -#ifdef WITH_SCANNER m_probe = new QVideoProbe(this); m_thread = new QrScanThread(this); m_thread->start(); QObject::connect(m_thread, SIGNAL(decoded(int,QString)), this, SLOT(processCode(int,QString))); QObject::connect(m_thread, SIGNAL(notifyError(const QString &, bool)), this, SIGNAL(notifyError(const QString &, bool))); connect(m_probe, SIGNAL(videoFrameProbed(QVideoFrame)), this, SLOT(processFrame(QVideoFrame))); -#endif } void QrCodeScanner::setSource(QCamera *camera) { @@ -97,12 +95,10 @@ void QrCodeScanner::setEnabled(bool enabled) } emit enabledChanged(); } -#ifdef WITH_SCANNER void QrCodeScanner::timerEvent(QTimerEvent *event) { if( (event->timerId() == m_processTimerId) ){ m_thread->addFrame(m_curFrame); } } -#endif diff --git a/src/QR-Code-scanner/QrCodeScanner.h b/src/QR-Code-scanner/QrCodeScanner.h index 791800f0..a6a747b3 100644 --- a/src/QR-Code-scanner/QrCodeScanner.h +++ b/src/QR-Code-scanner/QrCodeScanner.h @@ -31,9 +31,7 @@ #include <QImage> #include <QVideoFrame> -#ifdef WITH_SCANNER #include "QrScanThread.h" -#endif class QVideoProbe; class QCamera; @@ -64,10 +62,8 @@ Q_SIGNALS: void notifyError(const QString &error, bool warning = false); protected: -#ifdef WITH_SCANNER void timerEvent(QTimerEvent *); QrScanThread *m_thread; -#endif int m_processTimerId; int m_processInterval; int m_enabled; |