From 42f323ac8d253f5be0e999fe3d8e198b3e31c668 Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Fri, 10 Nov 2023 11:11:51 +0100
Subject: [PATCH] qml: remove APK version, add Qt and PyQt version strings to
 About page

---
 electrum/gui/qml/components/About.qml | 15 +++++++++++----
 electrum/gui/qml/qeapp.py             |  7 ++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/electrum/gui/qml/components/About.qml b/electrum/gui/qml/components/About.qml
index 60f14126f..b5736d53e 100644
--- a/electrum/gui/qml/components/About.qml
+++ b/electrum/gui/qml/components/About.qml
@@ -40,18 +40,25 @@ Pane {
                 text: BUILD.electrum_version
             }
             Label {
-                text: qsTr('APK Version')
+                text: qsTr('Protocol version')
                 Layout.alignment: Qt.AlignRight
             }
             Label {
-                text: BUILD.apk_version
+                text: BUILD.protocol_version
             }
             Label {
-                text: qsTr('Protocol version')
+                text: qsTr('Qt Version')
                 Layout.alignment: Qt.AlignRight
             }
             Label {
-                text: BUILD.protocol_version
+                text: BUILD.qt_version
+            }
+            Label {
+                text: qsTr('PyQt Version')
+                Layout.alignment: Qt.AlignRight
+            }
+            Label {
+                text: BUILD.pyqt_version
             }
             Label {
                 text: qsTr('License')
diff --git a/electrum/gui/qml/qeapp.py b/electrum/gui/qml/qeapp.py
index e6c3ccc1d..38c892651 100644
--- a/electrum/gui/qml/qeapp.py
+++ b/electrum/gui/qml/qeapp.py
@@ -7,7 +7,7 @@ import html
 import threading
 from typing import TYPE_CHECKING, Set
 
-from PyQt6.QtCore import (pyqtSlot, pyqtSignal, pyqtProperty, QObject,
+from PyQt6.QtCore import (pyqtSlot, pyqtSignal, pyqtProperty, QObject, QT_VERSION_STR, PYQT_VERSION_STR,
                           qInstallMessageHandler, QTimer, QSortFilterProxyModel)
 from PyQt6.QtGui import QGuiApplication, QFontDatabase, QScreen
 from PyQt6.QtQml import qmlRegisterType, qmlRegisterUncreatableType, QQmlApplicationEngine
@@ -411,8 +411,9 @@ class ElectrumQmlApplication(QGuiApplication):
         self.context.setContextProperty('QRIP', self.qr_ip_h)
         self.context.setContextProperty('BUILD', {
             'electrum_version': version.ELECTRUM_VERSION,
-            'apk_version': version.APK_VERSION,
-            'protocol_version': version.PROTOCOL_VERSION
+            'protocol_version': version.PROTOCOL_VERSION,
+            'qt_version': QT_VERSION_STR,
+            'pyqt_version': PYQT_VERSION_STR
         })
 
         self.plugins.load_plugin('trustedcoin')