diff options
| author | Ries van Twisk <github@rvt.dds.nl> | 2019-12-29 10:18:52 +0100 |
|---|---|---|
| committer | Ries van Twisk <github@rvt.dds.nl> | 2019-12-29 10:18:52 +0100 |
| commit | 21f8efcd03c2351135481f345a14245d422f63b4 (patch) | |
| tree | d5b10ef462c6a778d40252bc26a13444009e698c /options | |
| parent | 28c06bef4392108fc219c0accefe5a7db7c9f065 (diff) | |
| parent | c537acf6d7ebff26db9d5981d33d05fe7101baf6 (diff) | |
Merge branch 'unstable' of https://github.com/opentrack/opentrack into osx-build-fix
Diffstat (limited to 'options')
| -rw-r--r-- | options/bundle.hpp | 2 | ||||
| -rw-r--r-- | options/connector.hpp | 3 | ||||
| -rw-r--r-- | options/group.hpp | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/options/bundle.hpp b/options/bundle.hpp index d99ef06d..ce859bb1 100644 --- a/options/bundle.hpp +++ b/options/bundle.hpp @@ -24,8 +24,6 @@ #include <QDebug> -#include "compat/qhash.hpp" - #include "export.hpp" namespace options::detail { diff --git a/options/connector.hpp b/options/connector.hpp index e22cb20f..ffef2a3d 100644 --- a/options/connector.hpp +++ b/options/connector.hpp @@ -13,8 +13,7 @@ #include <QString> #include <QMutex> - -#include "compat/qhash.hpp" +#include <QHashFunctions> #include "export.hpp" diff --git a/options/group.hpp b/options/group.hpp index 93299b6e..751eee34 100644 --- a/options/group.hpp +++ b/options/group.hpp @@ -5,7 +5,6 @@ #include "compat/base-path.hpp" #include "compat/library-path.hpp" #include "compat/macros.hpp" -#include "compat/qhash.hpp" #include "export.hpp" #include <optional> |