tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Windows build for 1.24: switch to qt5.8 + tp5 qtwebkit

Browse Source
This commit is contained in:
Jean-Francois Dockes 2018-12-16 16:17:58 +01:00
parent 1de00ebae7
commit 136decd6b2
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qtgui/recoll-win.pro
View File

@ -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 = \

16
src/windows/mkinstdir.sh
View File

@ -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
}

5
src/windows/qmkrecoll/librecoll.pro
View File

@ -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 {

2
src/windows/qmkrecoll/recollindex.pro
View File

@ -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

2
src/windows/qmkrecoll/recollq.pro
View File

@ -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