diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-05 18:30:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-07 21:01:31 +0200 |
| commit | 50a90720be7d67dcdfe704a82fb3b1138edd2aab (patch) | |
| tree | cb1751c23c59e4753f13709bf24fa313e4949f5a /qmake/library/qmakeevaluator.cpp | |
| parent | 51c04e292efbcd1baa66f9f6663ba4d7b64da16d (diff) | |
make setting a bad $$[QMAKEFEATURES] not crash qmake
Task-number: QTBUG-29642
Change-Id: I9cc209eb313f03bf342bcb64b1de3005755700a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/library/qmakeevaluator.cpp')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 1b323439ab..9bf870ce39 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -1452,8 +1452,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()) { |