From da6990fb8e3ea27196e82bacf95c86d47d5660af Mon Sep 17 00:00:00 2001 From: kraxarn Date: Sun, 26 Jan 2025 18:45:42 +0100 Subject: [PATCH] Move workaround to header --- lib/include/lib/cache/jsoncache.hpp | 3 +-- lib/include/lib/filesystem.hpp | 10 ++++++++++ lib/include/lib/json.hpp | 2 +- lib/include/lib/paths/paths.hpp | 2 +- lib/test/src/settingstests.cpp | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 lib/include/lib/filesystem.hpp diff --git a/lib/include/lib/cache/jsoncache.hpp b/lib/include/lib/cache/jsoncache.hpp index 881922d2..6cd1fdcc 100644 --- a/lib/include/lib/cache/jsoncache.hpp +++ b/lib/include/lib/cache/jsoncache.hpp @@ -1,10 +1,9 @@ #pragma once #include "lib/cache.hpp" +#include "lib/filesystem.hpp" #include "lib/paths/paths.hpp" -#include - namespace lib { /** diff --git a/lib/include/lib/filesystem.hpp b/lib/include/lib/filesystem.hpp new file mode 100644 index 00000000..28cefcc8 --- /dev/null +++ b/lib/include/lib/filesystem.hpp @@ -0,0 +1,10 @@ +#pragma once + +// Workaround for +// https://bugreports.qt.io/browse/QTBUG-73263 + +#ifdef QT_CORE_LIB +#include +#endif + +#include // NOLINT(*-include-cleaner) diff --git a/lib/include/lib/json.hpp b/lib/include/lib/json.hpp index 27b41407..f06efa05 100644 --- a/lib/include/lib/json.hpp +++ b/lib/include/lib/json.hpp @@ -1,8 +1,8 @@ #pragma once +#include "lib/filesystem.hpp" #include "thirdparty/json.hpp" -#include #include namespace lib diff --git a/lib/include/lib/paths/paths.hpp b/lib/include/lib/paths/paths.hpp index 70847a3a..6893fc3e 100644 --- a/lib/include/lib/paths/paths.hpp +++ b/lib/include/lib/paths/paths.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "lib/filesystem.hpp" namespace lib { diff --git a/lib/test/src/settingstests.cpp b/lib/test/src/settingstests.cpp index d6056bd2..3e3f876c 100644 --- a/lib/test/src/settingstests.cpp +++ b/lib/test/src/settingstests.cpp @@ -1,9 +1,9 @@ +#include "lib/filesystem.hpp" #include "lib/log.hpp" #include "lib/settings.hpp" #include "lib/paths/paths.hpp" #include "thirdparty/doctest.h" -#include #include class test_paths: public lib::paths