From 3f7fdd192c584e82dc2b63f88f84b90460f87f0c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 24 Jul 2012 14:58:26 +0200 Subject: [PATCH] use QT_HOST_DATA/get to access the qmake files Change-Id: I0cdfcacb6e5e6f98914a87d8a1418f839f0c0da0 Reviewed-by: Daniel Teske --- src/shared/proparser/qmakeevaluator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 20dfdcefef6..334f504b70c 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1253,7 +1253,7 @@ QStringList QMakeEvaluator::qmakeMkspecPaths() const if (!m_sourceRoot.isEmpty()) ret << m_sourceRoot + concat; - ret << m_option->propertyValue(ProString("QT_HOST_DATA")) + concat; + ret << m_option->propertyValue(ProString("QT_HOST_DATA/get")) + concat; ret.removeDuplicates(); return ret; @@ -1302,7 +1302,7 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const } } - feature_bases << (m_option->propertyValue(ProString("QT_HOST_DATA")).toQString(m_mtmp) + feature_bases << (m_option->propertyValue(ProString("QT_HOST_DATA/get")).toQString(m_mtmp) + mkspecs_concat); foreach (const QString &fb, feature_bases) {