diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-31 16:40:12 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-03 16:35:23 +0200 |
commit | c2cfa6dd833f60d75cc7aafe7282d052cdae5257 (patch) | |
tree | 61abe2480beaef69b583e7ff420fa5db7ba1925d /installerfw.pri | |
parent | 955db4b7492cbb044de2a7f1d3a145e533f5a701 (diff) |
adding ConsumeOutputOperation
- With that operation we can save the original qmake output,
before the installer does the patching. So we can use the old values
for modules patching if they will be installed later.
- added a autotest which does that with the current used qmake
Change-Id: Ie07d273bf64d1813b7af3374a0db35a9e1215503
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'installerfw.pri')
-rw-r--r-- | installerfw.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/installerfw.pri b/installerfw.pri index 64af534e6..39773d68a 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -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 += \ |