File 0001-Support-ZXing-2.0.patch of Package kaidan

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Support-ZXing-2.0.patch of Package kaidan (Revision 2ead1f193839d4f4cf82ad3ae81b8137)

Currently displaying revision 2ead1f193839d4f4cf82ad3ae81b8137 , Show latest

From 7171e5c4bc31114be265f6fde8cc08a519c4a6f3 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Wed, 4 Jan 2023 17:28:31 +0100
Subject: [PATCH] Support ZXing 2.0

An alternative approach going forward might be replacing the entire direct
ZXing use and video stream processing by KF::Prison. Avoids duplicated
maintenance, but adds a new dependency.
---
 src/QrCodeDecoder.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/QrCodeDecoder.cpp b/src/QrCodeDecoder.cpp
index ea2a89d..081acb5 100644
--- a/src/QrCodeDecoder.cpp
+++ b/src/QrCodeDecoder.cpp
@@ -81,7 +81,11 @@ void QrCodeDecoder::decodeImage(const QImage &image)
 	// If a QR code could be found and decoded, emit a signal with the decoded string.
 	// Otherwise, emit a signal for failed decoding.
 	if (result.isValid())
+#if ZXING_VERSION < QT_VERSION_CHECK(2, 0, 0)
 		emit decodingSucceeded(QString::fromStdString(TextUtfEncoding::ToUtf8(result.text())));
+#else
+		emit decodingSucceeded(QString::fromStdString(result.text()));
+#endif
 	else
 		emit decodingFailed();
 }
-- 
2.40.1

Places

File 0001-Support-ZXing-2.0.patch of Package kaidan (Revision 2ead1f193839d4f4cf82ad3ae81b8137)

Places