From ab8696c504f6fb6af38e68f34a61f11ca11187e1 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Thu, 24 Jul 2025 08:33:20 +0200 Subject: [PATCH] does it work if I put the check separately then --- src/frontend/qt_sdl/CameraManager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/frontend/qt_sdl/CameraManager.cpp b/src/frontend/qt_sdl/CameraManager.cpp index d1b44c18..4e0d69e7 100644 --- a/src/frontend/qt_sdl/CameraManager.cpp +++ b/src/frontend/qt_sdl/CameraManager.cpp @@ -26,10 +26,12 @@ using namespace melonDS; const char* kCamConfigPath[] = {"DSi.Camera0", "DSi.Camera1"}; #if QT_VERSION >= 0x060000 -#if QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(permissions) +#if QT_VERSION_CHECK(6, 5, 0) +#if QT_CONFIG(permissions) #include #include #endif +#endif CameraFrameDumper::CameraFrameDumper(QObject* parent) : QVideoSink(parent) { @@ -355,7 +357,8 @@ void CameraManager::camStart() if (camDevice) { #if QT_VERSION_MAJOR >= 6 -#if QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(permissions) +#if QT_VERSION_CHECK(6, 5, 0) +#if QT_CONFIG(permissions) QCameraPermission cameraPermission; bool granted = false; switch (qApp->checkPermission(cameraPermission)) { @@ -367,6 +370,7 @@ void CameraManager::camStart() case Qt::PermissionStatus::Granted: break; } +#endif #endif camDumper = new CameraFrameDumper(this);