From 7ad74e1a7334c281d27eb05cd35400db8a4c0420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?=
 <david.lanzendoerfer@libresilicon.com>
Date: Fri, 5 Jan 2024 09:08:13 -0800
Subject: [PATCH] Adding version check (#11795)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adding version check

* Add compat component for Qt6

* Remove too many qts

* Fix include path

---------

Co-authored-by: David Lanzendörfer <leviathan@libresilicon.com>
---
 cMake/FreeCAD_Helpers/SetupQt.cmake           | 3 +++
 src/Mod/Material/App/MaterialConfigLoader.cpp | 5 +++--
 src/Mod/Material/App/MaterialLoader.cpp       | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake
index 45860d1496..7fcdfaf536 100644
--- a/cMake/FreeCAD_Helpers/SetupQt.cmake
+++ b/cMake/FreeCAD_Helpers/SetupQt.cmake
@@ -16,6 +16,9 @@ if(BUILD_GUI)
         endif()
     endif()
     list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools)
+    if (FREECAD_QT_MAJOR_VERSION EQUAL 6)
+        list (APPEND FREECAD_QT_COMPONENTS Core5Compat)
+    endif()
     if (BUILD_WEB)
         list (APPEND FREECAD_QT_COMPONENTS WebEngineWidgets)
     endif()
diff --git a/src/Mod/Material/App/MaterialConfigLoader.cpp b/src/Mod/Material/App/MaterialConfigLoader.cpp
index 449c00e571..fe2090f009 100644
--- a/src/Mod/Material/App/MaterialConfigLoader.cpp
+++ b/src/Mod/Material/App/MaterialConfigLoader.cpp
@@ -82,8 +82,9 @@ bool MaterialConfigLoader::readFile(const QString& path, QMap<QString, QString>&
     QFile infile(path);
     if (infile.open(QIODevice::ReadOnly)) {
         QTextStream in(&infile);
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         in.setCodec("UTF-8");
-
+#endif
         QString line;
         QString prefix;
         while (!in.atEnd()) {
@@ -1083,4 +1084,4 @@ MaterialConfigLoader::getMaterialFromPath(const std::shared_ptr<MaterialLibrary>
     addRenderWB(fcmat, finalModel);
 
     return finalModel;
-}
\ No newline at end of file
+}
diff --git a/src/Mod/Material/App/MaterialLoader.cpp b/src/Mod/Material/App/MaterialLoader.cpp
index bf2fab3978..a6ab7a5a8a 100644
--- a/src/Mod/Material/App/MaterialLoader.cpp
+++ b/src/Mod/Material/App/MaterialLoader.cpp
@@ -29,6 +29,10 @@
 #include <QList>
 #include <QMetaType>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+#include <QtCore5Compat/QRegExp>
+#endif
+
 #include <App/Application.h>
 #include <Base/Interpreter.h>
 #include <Gui/MetaTypes.h>