diff options
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/installerfw.pri b/installerfw.pri index 83196c4bd..c71749db2 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,15 +3,17 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION = 1.5.0 +IFW_VERSION = 1.5.1 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 - IFW_NEWLINE = $$escape_expand(\\n\\t) defineReplace(toNativeSeparators) { return($$replace(1, /, $$QMAKE_DIR_SEP)) } +defineReplace(fromNativeSeparators) { + return($$replace(1, \\\\, /)) +} defineReplace(cleanPath) { win32:1 ~= s|\\\\|/|g @@ -37,9 +39,9 @@ IFW_SOURCE_TREE = $$PWD IFW_APP_PATH = $$IFW_BUILD_TREE/bin 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)) +RCC = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/rcc)) +LRELEASE = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/lrelease)) +QMAKE_BINARY = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/qmake)) win32:RCC = $${RCC}.exe win32:LRELEASE = $${LRELEASE}.exe |