diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:30:59 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:31:06 +0200 |
commit | 640441882d20f86db05ab5fd1141abe39a0bd409 (patch) | |
tree | 9d0e701de155d32d3614a60b4d6eea5f324211f4 /src/tools | |
parent | d16692ed1b12b2d464afcb32799580402e82e393 (diff) | |
parent | eba979f6956f8d74bf5a3cb6ed0d585396b790f1 (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Conflicts:
src/network/socket/qnativesocketengine_winrt.cpp
Change-Id: I8edb72f8ba958d80c3d7993b3feaaae782ca8d9c
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index b3df192110..ae0d581a58 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -132,8 +132,12 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } -if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) -else:include(../../3rdparty/zlib_dependency.pri) +contains(QT_CONFIG, zlib)|cross_compile { + include(../../3rdparty/zlib.pri) +} else { + CONFIG += no_core_dep + include(../../3rdparty/zlib_dependency.pri) +} win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 |