From a1a342143b572dd811a4b5878992144e30fb25ab Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sat, 1 Oct 2022 20:49:32 +0200
Subject: [PATCH] Camera UI fixes

* Add camera permission on macOS
* Fix buttonClicked event for Qt 6 (it's now idClicked?)
---
 res/melon.plist.in                           | 2 ++
 src/frontend/qt_sdl/CameraSettingsDialog.cpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/res/melon.plist.in b/res/melon.plist.in
index 20d385a0..58d0c9ba 100644
--- a/res/melon.plist.in
+++ b/res/melon.plist.in
@@ -22,6 +22,8 @@
     <true/>
     <key>NSMicrophoneUsageDescription</key>
     <string>We need microphone access so you can use the emulated DS microphone</string>
+    <key>NSCameraUsageDescription</key>
+    <string>Camera access is needed for emulation of the DSi's cameras</string>
     <key>CFBundleDocumentTypes</key>
     <array>
         <dict>
diff --git a/src/frontend/qt_sdl/CameraSettingsDialog.cpp b/src/frontend/qt_sdl/CameraSettingsDialog.cpp
index ac195fd8..1844e0fd 100644
--- a/src/frontend/qt_sdl/CameraSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/CameraSettingsDialog.cpp
@@ -121,7 +121,11 @@ CameraSettingsDialog::CameraSettingsDialog(QWidget* parent) : QDialog(parent), u
     grpInputType->addButton(ui->rbPictureNone,   0);
     grpInputType->addButton(ui->rbPictureImg,    1);
     grpInputType->addButton(ui->rbPictureCamera, 2);
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
     connect(grpInputType, SIGNAL(buttonClicked(int)), this, SLOT(onChangeInputType(int)));
+#else
+    connect(grpInputType, SIGNAL(idClicked(int)), this, SLOT(onChangeInputType(int)));
+#endif
 
     previewPanel = new CameraPreviewPanel(this);
     QVBoxLayout* previewLayout = new QVBoxLayout();