From f4b0a8160c43900386bc208ee6a86955a8e9e5a5 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 28 Nov 2023 17:25:48 +0100
Subject: [PATCH] MSYS: fix broken Qt6 build using MinGW & clang

---
 src/Gui/CMakeLists.txt                    | 1 +
 src/Gui/DlgPreferencesImp.cpp             | 2 --
 src/Main/CMakeLists.txt                   | 3 +--
 tests/src/Mod/Material/App/CMakeLists.txt | 4 ++++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index f769346543..b2181e4a56 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -91,6 +91,7 @@ include_directories(
     ${QtSvgWidgets_INCLUDE_DIRS}
     ${QtNetwork_INCLUDE_DIRS}
     ${QtUiTools_INCLUDE_DIRS}
+    ${QtXml_INCLUDE_DIRS}
 )
 list(APPEND FreeCADGui_LIBS
     ${QtCore_LIBRARIES}
diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp
index 47dfeb717b..f41fbc6147 100644
--- a/src/Gui/DlgPreferencesImp.cpp
+++ b/src/Gui/DlgPreferencesImp.cpp
@@ -53,8 +53,6 @@
 #include "Tools.h"
 #include "WidgetFactory.h"
 
-#include <QDesktopWidget>
-
 using namespace Gui::Dialog;
 
 QWidget* PreferencesPageItem::getWidget() const
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 3a384371bc..118825f364 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -1,5 +1,3 @@
-#add_defintions(-D_FC_GUI_ENABLED_)
-#add_defintions(-DFREECADMAINPY)
 
 configure_file(freecad.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/freecad.rc)
 configure_file(freecadCmd.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/freecadCmd.rc)
@@ -10,6 +8,7 @@ if(BUILD_GUI)
         ${Boost_INCLUDE_DIRS}
         ${COIN3D_INCLUDE_DIRS}
         ${ZLIB_INCLUDE_DIR}
+        ${QtWidgets_INCLUDE_DIRS}
         ${QT_INCLUDE_DIR}
         ${PYTHON_INCLUDE_DIRS}
         ${XercesC_INCLUDE_DIRS}
diff --git a/tests/src/Mod/Material/App/CMakeLists.txt b/tests/src/Mod/Material/App/CMakeLists.txt
index 633cc8d9ba..a53373a5a9 100644
--- a/tests/src/Mod/Material/App/CMakeLists.txt
+++ b/tests/src/Mod/Material/App/CMakeLists.txt
@@ -9,3 +9,7 @@ target_sources(
     ${CMAKE_CURRENT_SOURCE_DIR}/TestModel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/TestModelProperties.cpp
 )
+
+target_include_directories(Material_tests_run PUBLIC
+    ${QtCore_INCLUDE_DIRS}
+)