From 9f654a29866f4e1dc34dff3ad5d435f66bd34327 Mon Sep 17 00:00:00 2001 From: Alexander Yee Date: Sun, 16 Aug 2026 00:01:43 -0700 Subject: [PATCH 1/2] Remove Mac-specific Qt from GlobalSettingsPanel. --- .../Source/CommonFramework/GlobalSettingsPanel.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index a6858726fa..13af539983 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -6,8 +6,6 @@ #include #include -#include -#include #include #include #include "Common/Cpp/ColoredText.h" @@ -64,8 +62,8 @@ GlobalSettings::GlobalSettings() "Stats File:
Use the stats file here. Multiple instances of the program can use the same file.", LockMode::LOCK_WHILE_RUNNING, #if defined(__APPLE__) - QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/UserSettings/PA-Stats.txt", - QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/UserSettings/PA-Stats.txt" + Filesystem::application_scratch_path().string() + "/UserSettings/PA-Stats.txt", + Filesystem::application_scratch_path().string() + "/UserSettings/PA-Stats.txt" #else "UserSettings/PA-Stats.txt", "UserSettings/PA-Stats.txt" @@ -76,8 +74,8 @@ GlobalSettings::GlobalSettings() "Temp Folder:
Place temporary files in this directory.", LockMode::LOCK_WHILE_RUNNING, #if defined(__APPLE__) - QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/TempFiles/", - QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/TempFiles/" + Filesystem::application_scratch_path().string() + "/TempFiles/", + Filesystem::application_scratch_path().string() + "/TempFiles/" #else "TempFiles/", "TempFiles/" From b03aacec7c518587a34d7ddd7a7b40a55253718b Mon Sep 17 00:00:00 2001 From: Alexander Yee Date: Sun, 16 Aug 2026 00:50:45 -0700 Subject: [PATCH 2/2] nope --- SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index 13af539983..db09f99b34 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -11,6 +11,7 @@ #include "Common/Cpp/ColoredText.h" #include "Common/Cpp/Containers/Pimpl.tpp" #include "Common/Cpp/LifetimeSanitizer.h" +#include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h"