From f0bcd606bd52eb63daa7701359a5dfee0306ab1c Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Sun, 29 Jan 2017 18:56:18 +0100
Subject: [PATCH] sigrok-cross-mingw: Switch to Qt5.

Also, drop an obsolete Qt(4) related patch.
---
 cross-compile/mingw/README          |  2 +-
 cross-compile/mingw/mxe_fixes.patch | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index e645124..27a4aab 100644
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -44,7 +44,7 @@ Apply some fixes that are currently required for a proper build:
 Build all required packages:
 
  $ make MXE_TARGETS=i686-w64-mingw32.static.posix gcc glib libzip libusb1 \
-   libftdi1 glibmm qt boost check
+   libftdi1 glibmm qt5 boost check
 
 This will take a while.
 
diff --git a/cross-compile/mingw/mxe_fixes.patch b/cross-compile/mingw/mxe_fixes.patch
index 029b45d..5ca41b2 100644
--- a/cross-compile/mingw/mxe_fixes.patch
+++ b/cross-compile/mingw/mxe_fixes.patch
@@ -4,9 +4,6 @@ MXE setup for sigrok usage.
  - Force libzip to use its own mkstemp() implementation.
    http://sigrok.org/bugzilla/show_bug.cgi?id=570#c2
 
- - Disable currently broken qtassistant (we don't need it anyway).
-   https://github.com/mxe/mxe/issues/565
-
 diff --git a/src/libzip.mk b/src/libzip.mk
 index 9d1e189..d4d5bf9 100644
 --- a/src/libzip.mk
@@ -21,26 +18,3 @@ index 9d1e189..d4d5bf9 100644
      $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) SUBDIRS=lib
  
      '$(TARGET)-gcc' \
-diff --git a/src/qt.mk b/src/qt.mk
-index 5bf3b08..bd8ef7a 100644
---- a/src/qt.mk
-+++ b/src/qt.mk
-@@ -75,12 +75,12 @@ define $(PKG)_BUILD
-     # lrelease (from linguist) needed to prepare translation files
-     $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install
- 
--    cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro
--    # can't figure out where -lQtCLucene comes from so use
--    # sed on the output instead of patching the input
--    $(MAKE) -C '$(1)/tools/assistant' sub-lib-qmake_all
--    $(SED) -i 's,-lQtCLucene$$,-lQtCLucene4,' '$(1)/tools/assistant/lib/Makefile.Release'
--    $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install
-+    ## cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro
-+    ## # can't figure out where -lQtCLucene comes from so use
-+    ## # sed on the output instead of patching the input
-+    ## $(MAKE) -C '$(1)/tools/assistant' sub-lib-qmake_all
-+    ## $(SED) -i 's,-lQtCLucene$$,-lQtCLucene4,' '$(1)/tools/assistant/lib/Makefile.Release'
-+    ## $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install
- 
-     # likewise for these two
-     cd '$(1)/tools/designer/src/designer' && '$(1)/bin/qmake' designer.pro
-- 
2.30.2