From 5d869c403c7d9bd8618b801711f500f17a77d854 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 28 Apr 2019 23:23:02 +1000
Subject: [PATCH] qttools: disable qdoc

requires libclang-devel

fixes #2324
---
 src/qttools-1-fixes.patch | 47 +++++++++++++++++++++++++++++++++++++++
 src/qttools-1.patch       | 24 --------------------
 src/qttools.mk            |  4 ++--
 3 files changed, 49 insertions(+), 26 deletions(-)
 create mode 100644 src/qttools-1-fixes.patch
 delete mode 100644 src/qttools-1.patch

diff --git a/src/qttools-1-fixes.patch b/src/qttools-1-fixes.patch
new file mode 100644
index 00000000..cae43ef8
--- /dev/null
+++ b/src/qttools-1-fixes.patch
@@ -0,0 +1,47 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 28 Apr 2019 23:07:09 +1000
+Subject: [PATCH 1/2] disable windeployqt (MXE specific)
+
+
+diff --git a/src/src.pro b/src/src.pro
+index 1111111..2222222 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -35,7 +35,7 @@ macos {
+ 
+ qtHaveModule(dbus): SUBDIRS += qdbus
+ 
+-win32|winrt:SUBDIRS += windeployqt
++#win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner
+ qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
+ 
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 28 Apr 2019 23:12:41 +1000
+Subject: [PATCH 2/2] disable qdoc (MXE specific - requires libclang-devel)
+
+
+diff --git a/src/src.pro b/src/src.pro
+index 1111111..2222222 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -23,9 +23,9 @@ qtConfig(library) {
+     !android|android_app: SUBDIRS += qtplugininfo
+ }
+ 
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
++#include($$OUT_PWD/qdoc/qtqdoc-config.pri)
++#QT_FOR_CONFIG += qdoc-private
++#qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
+ 
+ !android|android_app: SUBDIRS += qtpaths
+ 
diff --git a/src/qttools-1.patch b/src/qttools-1.patch
deleted file mode 100644
index 3b797c16..00000000
--- a/src/qttools-1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file is part of MXE. See LICENSE.md for licensing information.
-
-From 3dc7b77a86b4d399836472484a5b3448a27f1a1e Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Wed, 21 May 2014 11:31:45 +0200
-Subject: [PATCH] disable windeployqt (MXE specific)
-
-
-diff --git a/src/src.pro b/src/src.pro
-index 722b32e..66ce5bf 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -27,7 +27,7 @@ android {
- 
- qtHaveModule(dbus): SUBDIRS += qdbus
- 
--win32|winrt:SUBDIRS += windeployqt
-+#win32|winrt:SUBDIRS += windeployqt
- winrt:SUBDIRS += winrtrunner
- qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
- 
--- 
-2.1.2
-
diff --git a/src/qttools.mk b/src/qttools.mk
index 24171a46..6e622bb2 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -19,7 +19,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG+=config_clang_done CONFIG-=config_clang
+    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 
@@ -32,7 +32,7 @@ define $(PKG)_BUILD
 endef
 
 define $(PKG)_BUILD_$(BUILD)
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG+=config_clang_done CONFIG-=config_clang
+    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 endef