monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 08:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3027

Browse source 
0db4c36 QrScanThread: fix Qt 5.15 compability (selsta)
This commit is contained in:
luigi1111 2020-07-29 13:35:36 -05:00
commit 9220937c4b
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/QR-Code-scanner/QrScanThread.cpp
View file

@ -30,13 +30,8 @@
#include <QtGlobal> #include <QtGlobal>
#include <QDebug> #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); 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 #endif
QrScanThread::QrScanThread(QObject *parent) QrScanThread::QrScanThread(QObject *parent)
@ -108,7 +103,11 @@ void QrScanThread::processQImage(const QImage &qimg)
void QrScanThread::processVideoFrame(const QVideoFrame &frame) void QrScanThread::processVideoFrame(const QVideoFrame &frame)
{ {
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
processQImage( qt_imageFromVideoFrame(frame) ); processQImage( qt_imageFromVideoFrame(frame) );
#else
processQImage(frame.image());
#endif
} }
void QrScanThread::stop() void QrScanThread::stop()