From c76fc433eb3c22d67ba0149b7b2aa63328d27185 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 11 Aug 2017 15:52:47 +0200 Subject: [PATCH] qmake: remove pointless use of raw data in $$[QMAKEFEATURES] access property values are de-facto guaranteed to be backed by full QStrings, so there is nothing to be gained from using the raw data optimization, while doing so risks raw data leaks. Change-Id: I3d43da9aaadd4d5811c4b1a9d7ac734049da423c Reviewed-by: Joerg Bornemann (cherry picked from qtbase/18533ae2a72aba9ad8c0f1862e1e6ace50655864) Reviewed-by: Tobias Hunger --- src/shared/proparser/qmakeevaluator.cpp | 2 +- src/shared/proparser/qmakeevaluator.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 84f971b0cd2..00c87a7a23c 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1529,7 +1529,7 @@ void QMakeEvaluator::updateFeaturePaths() feature_roots += m_option->getPathListEnv(QLatin1String("QMAKEFEATURES")); feature_roots += m_qmakefeatures; feature_roots += m_option->splitPathList( - m_option->propertyValue(ProKey("QMAKEFEATURES")).toQString(m_mtmp)); + m_option->propertyValue(ProKey("QMAKEFEATURES")).toQString()); QStringList feature_bases; if (!m_buildRoot.isEmpty()) { diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 21e13451d66..7e1911501bb 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -303,7 +303,6 @@ public: ProStringList m_returnValue; ProValueMapStack m_valuemapStack; // VariableName must be us-ascii, the content however can be non-us-ascii. QString m_tmp1, m_tmp2, m_tmp3, m_tmp[2]; // Temporaries for efficient toQString - mutable QString m_mtmp; QMakeGlobals *m_option; QMakeParser *m_parser;