Skip to content

Remove Mac-specific Qt from GlobalSettingsPanel. #1396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mysticial merged 2 commits into from
Aug 16, 2026
Merged

Remove Mac-specific Qt from GlobalSettingsPanel. #1396

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f654a2
Remove Mac-specific Qt from GlobalSettingsPanel.
Mysticial Aug 16, 2026
b03aace
nope
Mysticial Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@

#include <iostream>
#include <set>
#include <QStandardPaths>
#include <QCryptographicHash>
#include <QDesktopServices>
#include <QUrl>
#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"
Expand Down Expand Up @@ -64,8 +63,8 @@ GlobalSettings::GlobalSettings()
"<b>Stats File:</b><br>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"
Expand All @@ -76,8 +75,8 @@ GlobalSettings::GlobalSettings()
"<b>Temp Folder:</b><br>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/"
Expand Down
Loading