summaryrefslogtreecommitdiff
path: root/src/shared/proparser/profileevaluator.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-09-18 10:54:52 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-06 14:00:55 +0100
commit7d4e3b7b4c69c9bcc42aa278ce91f4188fc06534 (patch)
tree07aa06aed0174c193f3adf374cf8ecb6797de336 /src/shared/proparser/profileevaluator.cpp
parenteba7efa3c65975d16d956fa8fc5bdc8ec45fb286 (diff)
downloadqt-creator-7d4e3b7b4c69c9bcc42aa278ce91f4188fc06534.tar.gz
fold m_qmakespecFull back into m_qmakespec
the original value is not used any more after the final resolution. Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969 (cherry picked from qttools/74d548c89dae83b392953f505876d8d383a72ce5, plus creator-specific amend) Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/shared/proparser/profileevaluator.cpp')
-rw-r--r--src/shared/proparser/profileevaluator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 960dcef6c2..ce8d43f81e 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -204,7 +204,7 @@ QString ProFileEvaluator::propertyValue(const QString &name) const
QString ProFileEvaluator::resolvedMkSpec() const
{
- return d->m_qmakespecFull;
+ return d->m_qmakespec;
}
#ifdef PROEVALUATOR_CUMULATIVE