feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fold m_qmakespecFull back into m_qmakespec

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2012-09-18 10:54:52 +02:00
parent eba7efa3c6
commit 7d4e3b7b4c
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/proparser/profileevaluator.cpp
View File

@@ -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