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

make setting a bad $$[QMAKEFEATURES] not crash qmake

Browse Source 
Task-number: QTBUG-29642
Change-Id: I9cc209eb313f03bf342bcb64b1de3005755700a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/50a90720be7d67dcdfe704a82fb3b1138edd2aab)
This commit is contained in:
Oswald Buddenhagen
2013-09-05 18:30:05 +02:00
parent 4d75cb93a3
commit dd2425eb02
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1445,8 +1445,8 @@ void QMakeEvaluator::updateFeaturePaths()
feature_roots += m_qmakefeatures;
feature_roots += m_option->propertyValue(ProKey("QMAKEFEATURES")).toQString(m_mtmp).split(
m_option->dirlist_sep, QString::SkipEmptyParts);
feature_roots += m_option->splitPathList(
m_option->propertyValue(ProKey("QMAKEFEATURES")).toQString(m_mtmp));
QStringList feature_bases;
if (!m_buildRoot.isEmpty()) {