diff options
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/installerfw.pri b/installerfw.pri index f8ba0efb8..4a42d3325 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,7 +3,7 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION = 1.3.1 +IFW_VERSION = 1.4.1 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 @@ -39,9 +39,11 @@ IFW_LIB_PATH = $$IFW_BUILD_TREE/lib RCC = $$cleanPath($$toNativeSeparators($$[QT_INSTALL_BINS]/rcc)) LRELEASE = $$cleanPath($$toNativeSeparators($$[QT_INSTALL_BINS]/lrelease)) +QMAKE_BINARY = $$cleanPath($$toNativeSeparators($$[QT_INSTALL_BINS]/qmake)) win32:RCC = $${RCC}.exe win32:LRELEASE = $${LRELEASE}.exe +win32:QMAKE_BINARY = $${QMAKE_BINARY}.exe win32-g++*:QMAKE_CXXFLAGS += -Wno-attributes INCLUDEPATH += \ @@ -98,11 +100,11 @@ CONFIG += depend_includepath GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1" IFW_VERSION=$$IFW_VERSION +DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION static { LIBS += -l7z win32-g++*: LIBS += -lmpr -luuid - macx:equals(TEMPLATE, app):CONFIG -= app_bundle win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib unix:exists($$IFW_LIB_PATH/libinstaller.a):POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a |