From 678d875db2d7696cc0a707b496c95adf5d59cee8 Mon Sep 17 00:00:00 2001 From: gg Date: Mon, 12 Jan 2026 21:39:43 -0500 Subject: [PATCH] camera/QT check on < Qt 6.5; red icon when node discon --- src/MainWindow.cpp | 2 +- src/qrcode/scanner/QrCodeScanWidget.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 58e6d05e..ade9db55 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1067,7 +1067,7 @@ void MainWindow::onConnectionStatusChanged(int status) } else { switch(status){ case Wallet::ConnectionStatus_Disconnected: - icon = icons()->icon("status_disconnected.svg"); + icon = icons()->icon("status_offline.svg"); this->setStatusText("Disconnected"); break; case Wallet::ConnectionStatus_Connecting: diff --git a/src/qrcode/scanner/QrCodeScanWidget.cpp b/src/qrcode/scanner/QrCodeScanWidget.cpp index 754aaa77..b1bd51b2 100644 --- a/src/qrcode/scanner/QrCodeScanWidget.cpp +++ b/src/qrcode/scanner/QrCodeScanWidget.cpp @@ -4,7 +4,9 @@ #include "QrCodeScanWidget.h" #include "ui_QrCodeScanWidget.h" +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #include +#endif #include #include @@ -73,6 +75,7 @@ void QrCodeScanWidget::startCapture(bool scan_ur) { ui->progressBar_UR->setVisible(m_scan_ur); ui->progressBar_UR->setFormat("Progress: %v%"); +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) QCameraPermission cameraPermission; switch (qApp->checkPermission(cameraPermission)) { case Qt::PermissionStatus::Undetermined: @@ -89,6 +92,10 @@ void QrCodeScanWidget::startCapture(bool scan_ur) { qDebug() << "Camera permission granted"; break; } +#else + // For Qt < 6.5, we rely on the backend (e.g., V4L2) to fail or QCamera::errorOccurred + // to report issues if permission is missing. There is no explicit QPermission API. +#endif if (ui->combo_camera->count() < 1) { ui->frame_error->setText("No cameras found. Attach a camera and press 'Refresh'."); -- 2.52.0