diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 16:44:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 16:44:41 +0100 |
| commit | 1f8ec5b6a4bed3cfa02eaa36d39bceb7d37fc891 (patch) | |
| tree | f225e5fe3d34ba9468634628338a16b1d087071f /installerfw.pri | |
| parent | b170fae8b21e25b9ddfc66f985e7d7040ab3d2c0 (diff) | |
| parent | ddf7aa85ec7bada4a96b2692e4b9f1bdd709cbad (diff) | |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
installerfw.pri
Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/installerfw.pri b/installerfw.pri index 127fbbafc..6f2ae42ce 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -41,13 +41,17 @@ IFW_LIB_PATH = $$IFW_BUILD_TREE/lib RCC = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/rcc)) LRELEASE = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/lrelease)) +LUPDATE = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/lupdate)) LCONVERT = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/lconvert)) QMAKE_BINARY = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/qmake)) -win32:RCC = $${RCC}.exe -win32:LRELEASE = $${LRELEASE}.exe -win32:LCONVERT = $${LCONVERT}.exe -win32:QMAKE_BINARY = $${QMAKE_BINARY}.exe +win32 { + RCC = $${RCC}.exe + LRELEASE = $${LRELEASE}.exe + LUPDATE = $${LUPDATE}.exe + LCONVERT = $${LCONVERT}.exe + QMAKE_BINARY = $${QMAKE_BINARY}.exe +} win32-g++*:QMAKE_CXXFLAGS += -Wno-attributes INCLUDEPATH += \ |