# HG changeset patch
# User John D
# Date 1433729585 14400
# Node ID 6303de54ff1bb9554b04a5ef24ab3c31e114091a
# Parent  ac3abcea55e87d71cadbd090e55407b1a4aa8d21
qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows

* src/qt.mk: add build of moc,release, uic, rcc when ENABLE_DEVEL_TOOL set for cross mingw

* src/qt-2-shared-tools-fixes.patch: new file

* dist-files.mk: add qt-2-shared-tools-fixes.patch

diff -r ac3abcea55e8 -r 6303de54ff1b dist-files.mk
--- a/dist-files.mk	Fri Jun 05 21:32:19 2015 -0400
+++ b/dist-files.mk	Sun Jun 07 22:13:05 2015 -0400
@@ -562,6 +562,7 @@
   qrupdate.mk \
   qscintilla.mk \
   qt-1-cherrypicks.patch \
+  qt-2-shared-tools-fixes.patch \
   qt-test.cpp \
   qt-test.pro \
   qt-test.ui \
diff -r ac3abcea55e8 -r 6303de54ff1b src/qt-2-shared-tools-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/qt-2-shared-tools-fixes.patch	Sun Jun 07 22:13:05 2015 -0400
@@ -0,0 +1,12 @@
+diff -ur qt-everywhere-opensource-src-4.8.7.orig/tools/linguist/shared/profileevaluator.cpp qt-everywhere-opensource-src-4.8.7/tools/linguist/shared/profileevaluator.cpp
+--- qt-everywhere-opensource-src-4.8.7.orig/tools/linguist/shared/profileevaluator.cpp	2015-06-07 17:14:32.348070244 -0400
++++ qt-everywhere-opensource-src-4.8.7/tools/linguist/shared/profileevaluator.cpp	2015-06-07 17:16:43.792075123 -0400
+@@ -65,7 +65,7 @@
+ #include <unistd.h>
+ #include <sys/utsname.h>
+ #else
+-#include <Windows.h>
++#include <windows.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
diff -r ac3abcea55e8 -r 6303de54ff1b src/qt.mk
--- a/src/qt.mk	Fri Jun 05 21:32:19 2015 -0400
+++ b/src/qt.mk	Sun Jun 07 22:13:05 2015 -0400
@@ -221,4 +221,20 @@
       $(if $(filter-out yes, $(MXE_NATIVE_BUILD)),
         mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/lrelease' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'))
 
+    # if mingw cross compiling, and want devel tools, create cross compiles uic, moc, rcc and lrelease
+    if [ "$(MXE_NATIVE_BUILD)" = "no" -a "$(MXE_SYSTEM)" = "mingw" ]; then \
+      if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \
+        for f in bootstrap moc uic rcc; do \
+          echo "do make in $$f"; \
+          make -C "$(1)/src/tools/$$f" distclean; \
+          cd "$(1)/src/tools/$$f" && $(MXE_QMAKE) -makefile -spec '$(1)/mkspecs/win32-g++'; \
+          make -C "$(1)/src/tools/$$f"; \
+          make -C "$(1)/src/tools/$$f" -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
+        done; \
+        make -C '$(1)/tools/linguist/lrelease' distclean; \
+        cd '$(1)/tools/linguist/lrelease' && $(MXE_QMAKE) -makefile -spec '$(1)/mkspecs/win32-g++'; \
+        make -C '$(1)/tools/linguist/lrelease'; \
+        make -C '$(1)/tools/linguist/lrelease' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
+      fi; \
+    fi
 endef