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

This commit is contained in:
Jean-Francois Dockes
2018-12-16 16:18:51 +01:00
parent 1de00ebae7
commit 136decd6b2
5 changed files with 18 additions and 10 deletions
-5
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 {
+1 -1
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
+1 -1
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