Windows: update qt to 5.14.2
This commit is contained in:
parent
a85b1084c5
commit
349003561e
@ -120,13 +120,13 @@ windows {
|
|||||||
RECOLLDEPS = ../../../recolldeps/msvc
|
RECOLLDEPS = ../../../recolldeps/msvc
|
||||||
DEFINES += USING_STATIC_LIBICONV
|
DEFINES += USING_STATIC_LIBICONV
|
||||||
LIBS += \
|
LIBS += \
|
||||||
-L../windows/build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibrecoll \
|
-llibrecoll \
|
||||||
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
|
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
|
||||||
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
|
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
|
||||||
-L../windows/build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L../windows/build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibxapian \
|
-llibxapian \
|
||||||
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibiconv \
|
-llibiconv \
|
||||||
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
|
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
|
||||||
-lrpcrt4 -lws2_32 -luser32 \
|
-lrpcrt4 -lws2_32 -luser32 \
|
||||||
|
|||||||
@ -36,14 +36,14 @@ windows {
|
|||||||
RECOLLDEPS = ../../../../recolldeps/msvc
|
RECOLLDEPS = ../../../../recolldeps/msvc
|
||||||
DEFINES += USING_STATIC_LIBICONV
|
DEFINES += USING_STATIC_LIBICONV
|
||||||
LIBS += \
|
LIBS += \
|
||||||
-L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibrecoll \
|
-llibrecoll \
|
||||||
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
|
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
|
||||||
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
|
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
|
||||||
-L../build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L../build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibxapian \
|
-llibxapian \
|
||||||
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
|
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
|
||||||
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibiconv -lShell32 \
|
-llibiconv -lShell32 \
|
||||||
-lrpcrt4 -lws2_32 -luser32 \
|
-lrpcrt4 -lws2_32 -luser32 \
|
||||||
-lshlwapi -lpsapi -lkernel32
|
-lshlwapi -lpsapi -lkernel32
|
||||||
|
|||||||
@ -30,13 +30,13 @@ windows {
|
|||||||
# Visual Studio
|
# Visual Studio
|
||||||
RECOLLDEPS = ../../../../recolldeps/msvc
|
RECOLLDEPS = ../../../../recolldeps/msvc
|
||||||
LIBS += \
|
LIBS += \
|
||||||
-L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibrecoll \
|
-llibrecoll \
|
||||||
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
|
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
|
||||||
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
|
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
|
||||||
-L../build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
|
-L../build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
|
||||||
-llibxapian \
|
-llibxapian \
|
||||||
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release/ \
|
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/ \
|
||||||
-llibiconv \
|
-llibiconv \
|
||||||
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
|
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
|
||||||
-lrpcrt4 -lws2_32 -luser32 -lshell32 \
|
-lrpcrt4 -lws2_32 -luser32 -lshell32 \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user