diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-12 01:13:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-12 01:13:17 -0700 |
| commit | 6b6d6a01dc9cf05715f01e3a549740b169ef9ae3 (patch) | |
| tree | 8ba9746a188c39003213839825552543e3f1a48f /launcher/settings/SettingsObject.h | |
| parent | f27716656c6f6006238203669a7a02f035733fc0 (diff) | |
| parent | c5aff7cc1ef43a1326bd3ce0c83e29669e2ff43f (diff) | |
| download | PrismLauncher-6b6d6a01dc9cf05715f01e3a549740b169ef9ae3.tar.gz PrismLauncher-6b6d6a01dc9cf05715f01e3a549740b169ef9ae3.tar.bz2 PrismLauncher-6b6d6a01dc9cf05715f01e3a549740b169ef9ae3.zip | |
Merge branch 'develop' into fix/network_and_signals
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/settings/SettingsObject.h')
| -rw-r--r-- | launcher/settings/SettingsObject.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/launcher/settings/SettingsObject.h b/launcher/settings/SettingsObject.h index 6200bc3a..4d735511 100644 --- a/launcher/settings/SettingsObject.h +++ b/launcher/settings/SettingsObject.h @@ -19,6 +19,8 @@ #include <QMap> #include <QStringList> #include <QVariant> +#include <QJsonDocument> +#include <QJsonArray> #include <memory> class Setting; |