diff --git a/Externals/Qt-macOS b/Externals/Qt-macOS index 5a3c05f3..8d1a06e9 160000 --- a/Externals/Qt-macOS +++ b/Externals/Qt-macOS @@ -1 +1 @@ -Subproject commit 5a3c05f3a6c9249826cdb31f014c62b9bc984bae +Subproject commit 8d1a06e904d6e30fd74d5136b975c60e84daf3bc diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index fedd8f35..1ce5ceaa 100755 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -61,9 +61,7 @@ endif () find_package(Qt6Core REQUIRED) find_package(Qt6Gui REQUIRED) -if (NOT APPLE) - find_package(Qt6Svg REQUIRED) -endif () +find_package(Qt6Svg REQUIRED) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) @@ -101,9 +99,7 @@ add_executable(dolphin-memory-engine ${GUI_TYPE} ${SRCS}) target_link_libraries(dolphin-memory-engine Qt6::Widgets) target_link_libraries(dolphin-memory-engine Qt6::Gui) target_link_libraries(dolphin-memory-engine Qt6::Core) -if (NOT APPLE) - target_link_libraries(dolphin-memory-engine Qt6::Svg) -endif () +target_link_libraries(dolphin-memory-engine Qt6::Svg) if(WIN32) set_target_properties(dolphin-memory-engine PROPERTIES OUTPUT_NAME DolphinMemoryEngine) diff --git a/Source/DolphinProcess/Mac/MacDolphinProcess.cpp b/Source/DolphinProcess/Mac/MacDolphinProcess.cpp index f57824ca..a9e7d4d7 100644 --- a/Source/DolphinProcess/Mac/MacDolphinProcess.cpp +++ b/Source/DolphinProcess/Mac/MacDolphinProcess.cpp @@ -5,6 +5,7 @@ #include "../../Common/MemoryCommon.h" #include +#include #include #include #include diff --git a/Source/GUI/MemCopy/DlgCopy.cpp b/Source/GUI/MemCopy/DlgCopy.cpp index a11afac5..64bc6fa3 100644 --- a/Source/GUI/MemCopy/DlgCopy.cpp +++ b/Source/GUI/MemCopy/DlgCopy.cpp @@ -168,9 +168,9 @@ bool DlgCopy::isHexString(std::string_view str) str = str.substr(2); } - return std::ranges::all_of(str.cbegin(), str.cend(), [](const char c) { - return ('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F'); - }); + return std::find_if(str.cbegin(), str.cend(), [](const char c) { + return !(('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F')); + }) == str.cend(); } bool DlgCopy::hexStringToU32(const std::string_view str, u32& output) @@ -193,8 +193,8 @@ bool DlgCopy::hexStringToU32(const std::string_view str, u32& output) bool DlgCopy::isUnsignedIntegerString(const std::string_view str) { - return std::ranges::all_of(str.cbegin(), str.cend(), - [](const char c) { return '0' <= c && c <= '9'; }); + return std::find_if(str.cbegin(), str.cend(), + [](const char c) { return !('0' <= c && c <= '9'); }) == str.cend(); } bool DlgCopy::uintStringToU32(const std::string_view str, u32& output) diff --git a/Source/GUI/MemWatcher/MemWatchWidget.cpp b/Source/GUI/MemWatcher/MemWatchWidget.cpp index 0d9b08f1..90c5aac2 100644 --- a/Source/GUI/MemWatcher/MemWatchWidget.cpp +++ b/Source/GUI/MemWatcher/MemWatchWidget.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "../../Common/MemoryCommon.h" #include "../../MemoryWatch/MemWatchEntry.h" diff --git a/Source/GUI/Settings/SConfig.h b/Source/GUI/Settings/SConfig.h index ef285161..caa2de1d 100644 --- a/Source/GUI/Settings/SConfig.h +++ b/Source/GUI/Settings/SConfig.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include