From: tobtoht Date: Sat, 10 Jul 2021 15:36:30 +0000 (+0200) Subject: Qr scanner: use camera description on Windows X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=2b2107b32dd8965baef6e60f34b386def1f41c1b;p=gamesguru%2Ffeather.git Qr scanner: use camera description on Windows --- diff --git a/src/qrcode_scanner/QrCodeScanDialog.cpp b/src/qrcode_scanner/QrCodeScanDialog.cpp index 37d289c2..1dd78b31 100644 --- a/src/qrcode_scanner/QrCodeScanDialog.cpp +++ b/src/qrcode_scanner/QrCodeScanDialog.cpp @@ -26,7 +26,11 @@ QrCodeScanDialog::QrCodeScanDialog(QWidget *parent) } for (const auto &camera : m_cameras) { +#ifdef Q_OS_WIN + ui->combo_camera->addItem(camera.description()); +#else ui->combo_camera->addItem(camera.deviceName()); +#endif } connect(ui->combo_camera, QOverload::of(&QComboBox::currentIndexChanged), this, &QrCodeScanDialog::onCameraSwitched);