From 2a4ef827a95be1a09f8c16bfadc351fb1ee2d96e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 31 Jul 2009 20:37:47 +0200
Subject: [PATCH] inject QT_VERSION into the evaluator
almost too simple to be right, given the TODO ...
---
src/plugins/qt4projectmanager/profilereader.cpp | 1 -
src/plugins/qt4projectmanager/qtversionmanager.cpp | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp
index e3550b686cc..8b408cc2603 100644
--- a/src/plugins/qt4projectmanager/profilereader.cpp
+++ b/src/plugins/qt4projectmanager/profilereader.cpp
@@ -47,7 +47,6 @@ ProFileReader::~ProFileReader()
void ProFileReader::setQtVersion(QtVersion *qtVersion) {
addProperties(qtVersion->versionInfo());
- // ### TODO override QT_VERSION property
}
bool ProFileReader::readProFile(const QString &fileName)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 4e0c62f9769..9357c50a4fa 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -758,6 +758,7 @@ void QtVersion::updateVersionInfo() const
QFileInfo qmake(qmakeCommand());
if (qmake.exists()) {
static const char * const variables[] = {
+ "QT_VERSION",
"QT_INSTALL_DATA",
"QT_INSTALL_LIBS",
"QT_INSTALL_HEADERS",
--
GitLab