4
0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-05 01:39:34 +00:00

add NOMINMAX to fix compile with Qt5.7 in Windows

Task-number: QTIFW-854
Change-Id: I73cb2a40d59803050c1b8f729e22a4caebcab724
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Katja Marttila 2016-05-20 14:29:27 +03:00 committed by Katja Marttila
parent dce1c56256
commit c24d9312c2

@ -120,8 +120,9 @@ isEmpty(GIT_SHA1) {
GIT_SHA1=\"$$cat(.tag)\"
}
DEFINES += QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUILDER "_GIT_SHA1_=$$GIT_SHA1" \
IFW_VERSION_STR=$$IFW_VERSION_STR IFW_VERSION=$$IFW_VERSION
DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUILDER \
"_GIT_SHA1_=$$GIT_SHA1" \
IFW_VERSION_STR=$$IFW_VERSION_STR IFW_VERSION=$$IFW_VERSION
DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION
static {