From 11d957d04381c7162dd5621c61f9963580ec7041 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 13 May 2016 15:26:42 +0200 Subject: make QMakeEvaluator::isActiveConfig() take a QStringRef argument saves some more cheap but pointless conversions to QString. this makes the introduction of the ProStringList::contains(QStringRef) overload necessary. Change-Id: Ic61993bd9a4b28fbba1b8e346345fd5f5636c6f0 Reviewed-by: Joerg Bornemann --- qmake/project.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qmake/project.h') diff --git a/qmake/project.h b/qmake/project.h index aa9f7dfb3b..9f3b9a56bc 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -64,6 +64,8 @@ public: int intValue(const ProKey &v, int defaultValue = 0) const; const ProValueMap &variables() const { return m_valuemapStack.first(); } ProValueMap &variables() { return m_valuemapStack.first(); } + bool isActiveConfig(const QString &config, bool regex = false) + { return QMakeEvaluator::isActiveConfig(QStringRef(&config), regex); } void dump() const; @@ -78,7 +80,6 @@ public: using QMakeEvaluator::propertyValue; using QMakeEvaluator::values; using QMakeEvaluator::first; - using QMakeEvaluator::isActiveConfig; using QMakeEvaluator::isHostBuild; using QMakeEvaluator::dirSep; -- cgit v1.2.1