diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-05 18:30:05 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-29 12:26:14 +0100 |
| commit | dd2425eb02db456b851c4662ff6a65d0b54b7eeb (patch) | |
| tree | c09fed7f1e82b23409261623cd9e246c48925100 /src/shared/proparser/qmakeevaluator.cpp | |
| parent | 4d75cb93a3b707e40ef34a381809b72dd68d8962 (diff) | |
| download | qt-creator-dd2425eb02db456b851c4662ff6a65d0b54b7eeb.tar.gz | |
make setting a bad $$[QMAKEFEATURES] not crash qmake
Task-number: QTBUG-29642
Change-Id: I9cc209eb313f03bf342bcb64b1de3005755700a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/50a90720be7d67dcdfe704a82fb3b1138edd2aab)
Diffstat (limited to 'src/shared/proparser/qmakeevaluator.cpp')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 1da18a3980..b8caf12694 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -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()) { |