diff options
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/installerfw.pri b/installerfw.pri index f2ee3dd67..d089dcf36 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,8 +3,8 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION_STR = 2.0.3 -IFW_VERSION = 0x020003 +IFW_VERSION_STR = 2.0.81 +IFW_VERSION = 0x020081 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 IFW_NEWLINE = $$escape_expand(\\n\\t) @@ -120,8 +120,9 @@ isEmpty(GIT_SHA1) { GIT_SHA1=\"$$cat(.tag)\" } -DEFINES += QT_NO_CAST_FROM_ASCII 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 { @@ -129,7 +130,7 @@ static { win32-g++*: LIBS += -lmpr -luuid equals(TEMPLATE, app) { - win32-msvc*:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib + msvc:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a } |