From c24d9312c281a6f6a52bf5df53e60850cce3e580 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Fri, 20 May 2016 14:29:27 +0300 Subject: add NOMINMAX to fix compile with Qt5.7 in Windows Task-number: QTIFW-854 Change-Id: I73cb2a40d59803050c1b8f729e22a4caebcab724 Reviewed-by: Simon Hausmann --- installerfw.pri | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'installerfw.pri') diff --git a/installerfw.pri b/installerfw.pri index 2f2dbdf7e..d089dcf36 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -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 { -- cgit v1.2.3