From 8b7eacc19f32d67206d269d6394a3889c60ea801 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 18 Mar 2010 12:43:13 +0100
Subject: [PATCH] Treat a set QMAKEFEATURES correctly

We used to ignore if someone had set a additional for his qmake, with
qmake -set QMAKEFEATURES. The fix is a simple oneliner from Filip
Piechocki. See qt-creator merge request 130.

Task-Nr: QTCREATORBUG-805
---
 src/plugins/qt4projectmanager/qtversionmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 07ccf19766e..7c8ee79eaae 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -968,7 +968,8 @@ void QtVersion::updateVersionInfo() const
              "QT_INSTALL_PLUGINS",
              "QT_INSTALL_BINS",
              "QT_INSTALL_DOCS",
-             "QT_INSTALL_PREFIX"
+             "QT_INSTALL_PREFIX",
+             "QMAKEFEATURES"
         };
         QStringList args;
         for (uint i = 0; i < sizeof variables / sizeof variables[0]; ++i)
-- 
GitLab