diff options
Diffstat (limited to 'src/tools/bootstrap')
-rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 2eb8837b4c..f763d0c8fe 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -23,6 +23,7 @@ MODULE_DEFINES = \ DEFINES += \ $$MODULE_DEFINES \ QT_CRYPTOGRAPHICHASH_ONLY_SHA1 \ + QT_NO_FOREACH \ QT_NO_CAST_FROM_ASCII DEFINES -= QT_EVAL @@ -133,8 +134,12 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } -!contains(QT_CONFIG, system-zlib)|cross_compile:include(../../3rdparty/zlib.pri) -else:include(../../3rdparty/zlib_dependency.pri) +!contains(QT_CONFIG, system-zlib)|cross_compile { + include(../../3rdparty/zlib.pri) +} else { + CONFIG += no_core_dep + include(../../3rdparty/zlib_dependency.pri) +} win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 |