From 136decd6b24672c67e391ba00a41267c96bb133e Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Sun, 16 Dec 2018 16:17:58 +0100
Subject: [PATCH] Windows build for 1.24: switch to qt5.8 + tp5 qtwebkit

---
 src/qtgui/recoll-win.pro              |  3 ++-
 src/windows/mkinstdir.sh              | 16 ++++++++++++++--
 src/windows/qmkrecoll/librecoll.pro   |  5 -----
 src/windows/qmkrecoll/recollindex.pro |  2 +-
 src/windows/qmkrecoll/recollq.pro     |  2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/qtgui/recoll-win.pro b/src/qtgui/recoll-win.pro
index 487fba3f..cd5de1c2 100644
--- a/src/qtgui/recoll-win.pro
+++ b/src/qtgui/recoll-win.pro
@@ -91,6 +91,7 @@ FORMS   = \
         firstidx.ui \
         idxsched.ui \
         widgets/listdialog.ui \
+        preview.ui \
         ptrans.ui \
         rclmain.ui \
         restable.ui \
@@ -117,7 +118,7 @@ windows {
     contains(QMAKE_CC, cl){
         # Visual Studio
     }
-    LIBS += C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Release/release/librecoll.dll
+    LIBS += C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll
 }
 
 TRANSLATIONS = \
diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
index 5e7800ff..ed440342 100644
--- a/src/windows/mkinstdir.sh
+++ b/src/windows/mkinstdir.sh
@@ -51,10 +51,10 @@ gccpath=`which gcc`
 MINGWBIN=`dirname $gccpath`
 
 # Where to copy the Qt Dlls from:
-QTBIN=C:/Qt/5.5/mingw492_32/bin
+QTBIN=C:/Qt/Qt5.8.0/5.8/mingw53_32/bin
 
 # Qt arch
-QTA=Desktop_Qt_5_5_0_MinGW_32bit
+QTA=Desktop_Qt_5_8_0_MinGW_32bit
 
 RCLW=$RCL/windows/
 
@@ -94,6 +94,18 @@ copyqt()
     PATH=$QTBIN:$PATH
     export PATH
     $QTBIN/windeployqt recoll.exe
+    # Apparently because the webkit part was grafted "by hand" on the
+    # Qt set, we need to copy some dll explicitely
+    addlibs="Qt5Core.dll Qt5Multimedia.dll \
+Qt5MultimediaWidgets.dll Qt5Network.dll Qt5OpenGL.dll \
+Qt5Positioning.dll Qt5PrintSupport.dll Qt5Sensors.dll \
+Qt5Sql.dll icudt57.dll \
+icuin57.dll icuuc57.dll libQt5WebKit.dll \
+libQt5WebKitWidgets.dll \
+libxml2-2.dll libxslt-1.dll"
+   for i in $addlibs;do
+       chkcp $QTBIN/$i $DESTDIR
+   done
     chkcp $QTBIN/libwinpthread-1.dll $DESTDIR
     chkcp $QTBIN/libstdc++-6.dll $DESTDIR
 }
diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro
index e23a5360..cec6fe97 100644
--- a/src/windows/qmkrecoll/librecoll.pro
+++ b/src/windows/qmkrecoll/librecoll.pro
@@ -133,11 +133,6 @@ windows {
       c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
   INCLUDEPATH += ../../windows \
             C:/temp/xapian-core-1.4.5/include
-
-#  LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll \
-#       c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
-#  INCLUDEPATH += ../../windows \
-            C:/temp/xapian-core-1.2.21/include
 }
 
 unix {
diff --git a/src/windows/qmkrecoll/recollindex.pro b/src/windows/qmkrecoll/recollindex.pro
index 3f9e2994..7a216b10 100644
--- a/src/windows/qmkrecoll/recollindex.pro
+++ b/src/windows/qmkrecoll/recollindex.pro
@@ -31,7 +31,7 @@ windows {
         # Visual Studio
     }
   LIBS += \
-    C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Release/release/librecoll.dll \
+    C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
     -lshlwapi -lpsapi -lkernel32
 
   INCLUDEPATH += ../../windows
diff --git a/src/windows/qmkrecoll/recollq.pro b/src/windows/qmkrecoll/recollq.pro
index c012abf1..a233aaf3 100644
--- a/src/windows/qmkrecoll/recollq.pro
+++ b/src/windows/qmkrecoll/recollq.pro
@@ -29,7 +29,7 @@ windows {
         # Visual Studio
     }
   LIBS += \
-    C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Release/release/librecoll.dll \
+    C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
     -lshlwapi -lpsapi -lkernel32
 
   INCLUDEPATH += ../../windows