diff options
Diffstat (limited to 'options')
| -rw-r--r-- | options/bundle.hpp | 1 | ||||
| -rw-r--r-- | options/connector.hpp | 3 | ||||
| -rw-r--r-- | options/globals.cpp | 2 | ||||
| -rw-r--r-- | options/group.hpp | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/options/bundle.hpp b/options/bundle.hpp index ce859bb1..158fcef9 100644 --- a/options/bundle.hpp +++ b/options/bundle.hpp @@ -10,6 +10,7 @@ #include "group.hpp" #include "connector.hpp" +#include "compat/qhash.hpp" #include <memory> #include <tuple> diff --git a/options/connector.hpp b/options/connector.hpp index ffef2a3d..025efda2 100644 --- a/options/connector.hpp +++ b/options/connector.hpp @@ -8,12 +8,13 @@ #pragma once +#include "compat/qhash.hpp" + #include <unordered_map> #include <vector> #include <QString> #include <QMutex> -#include <QHashFunctions> #include "export.hpp" diff --git a/options/globals.cpp b/options/globals.cpp index 099a7208..386ef56d 100644 --- a/options/globals.cpp +++ b/options/globals.cpp @@ -154,8 +154,8 @@ fail: constexpr const char* subdir = "ini"; QString dir = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).value(0, QString()); if (dir.isEmpty()) goto fail; -#if !defined _WIN32 && !defined __APPLE__ const QString fmt = QStringLiteral("%1/%2"); +#if !defined _WIN32 && !defined __APPLE__ if (!QFile::exists(fmt.arg(dir, OPENTRACK_ORG))) { dir = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).value(0, QString()); diff --git a/options/group.hpp b/options/group.hpp index 751eee34..93299b6e 100644 --- a/options/group.hpp +++ b/options/group.hpp @@ -5,6 +5,7 @@ #include "compat/base-path.hpp" #include "compat/library-path.hpp" #include "compat/macros.hpp" +#include "compat/qhash.hpp" #include "export.hpp" #include <optional> |