From 0db4c36db07e4c8da891e0bfda12c6135d44b1cf Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Wed, 29 Jul 2020 17:40:58 +0200
Subject: [PATCH] QrScanThread: fix Qt 5.15 compability

---
 src/QR-Code-scanner/QrScanThread.cpp | 11 +++++------
 1 file 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()