Move workaround to header

kraxarn · Jan 26, 2025 · da6990f · da6990f
1 parent 4f32b0b
commit da6990f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git 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 <filesystem>
-
 namespace lib
 {
 	/**

diff --git a/lib/include/lib/filesystem.hpp 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 <QCoreApplication>
+#endif
+
+#include <filesystem> // NOLINT(*-include-cleaner)
diff --git 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 <filesystem>
 #include <optional>
 
 namespace lib

diff --git a/lib/include/lib/paths/paths.hpp b/lib/include/lib/paths/paths.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <filesystem>
+#include "lib/filesystem.hpp"
 
 namespace lib
 {

diff --git 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 <filesystem>
 #include <fstream>
 
 class test_paths: public lib::paths