diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-07-29 13:35:36 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-07-29 13:35:36 -0500 |
| commit | 9220937c4bfa43e6fc04feee32fc920f46cb95e0 (patch) | |
| tree | daf727104f1f15b4c201713c55ff643d003921dd | |
| parent | 6aaf294f0be838bee092840b964dbd7ded76baa5 (diff) | |
| parent | 0db4c36db07e4c8da891e0bfda12c6135d44b1cf (diff) | |
| download | monzero-gui-9220937c4bfa43e6fc04feee32fc920f46cb95e0.tar.gz monzero-gui-9220937c4bfa43e6fc04feee32fc920f46cb95e0.tar.xz monzero-gui-9220937c4bfa43e6fc04feee32fc920f46cb95e0.zip | |
Merge pull request #3027
0db4c36 QrScanThread: fix Qt 5.15 compability (selsta)
| -rw-r--r-- | src/QR-Code-scanner/QrScanThread.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/QR-Code-scanner/QrScanThread.cpp b/src/QR-Code-scanner/QrScanThread.cpp index 8f33f32d..15f4c030 100644 --- a/src/QR-Code-scanner/QrScanThread.cpp +++ b/src/QR-Code-scanner/QrScanThread.cpp @@ -30,13 +30,8 @@ #include <QtGlobal> #include <QDebug> -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) extern QImage qt_imageFromVideoFrame(const QVideoFrame &f); -#else -QImage qt_imageFromVideoFrame(const QVideoFrame &f){ - Q_ASSERT_X(0 != 0, "qt_imageFromVideoFrame", "Should have been managed in .pro"); - return QImage(); -} #endif QrScanThread::QrScanThread(QObject *parent) @@ -108,7 +103,11 @@ void QrScanThread::processQImage(const QImage &qimg) void QrScanThread::processVideoFrame(const QVideoFrame &frame) { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) processQImage( qt_imageFromVideoFrame(frame) ); +#else + processQImage(frame.image()); +#endif } void QrScanThread::stop() |