From c2cfa6dd833f60d75cc7aafe7282d052cdae5257 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Fri, 31 May 2013 16:40:12 +0200
Subject: 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>
---
 installerfw.pri | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'installerfw.pri')

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 += \
-- 
cgit v1.2.3