From d518178df885d2c58bf2ff5a1f45f1af8fd04ae4 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 23 Dec 2016 13:49:41 +0100
Subject: Add PropertyMapInternal::moduleProperty

Add a new convenience method PropertyMapInternal::moduleProperty
to access module properties without invoking the PropertyFinder
and use it where applicable.

Change-Id: Ie573c71516b25ed3159d6c86769baa6b058c0956
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/lib/corelib/api/projectdata.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/lib/corelib/api/projectdata.cpp')

diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 4363a0ccf..94ae87c7a 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -43,7 +43,6 @@
 #include <language/propertymapinternal.h>
 #include <tools/fileinfo.h>
 #include <tools/jsliterals.h>
-#include <tools/propertyfinder.h>
 #include <tools/qbsassert.h>
 
 #include <QDir>
@@ -818,8 +817,7 @@ QVariant PropertyMap::getProperty(const QString &name) const
 QStringList PropertyMap::getModulePropertiesAsStringList(const QString &moduleName,
                                                           const QString &propertyName) const
 {
-    const QVariantList &vl = Internal::PropertyFinder().propertyValue(d->m_map->value(), moduleName,
-                                                                      propertyName).toList();
+    const QVariantList &vl = d->m_map->moduleProperty(moduleName, propertyName).toList();
     QStringList sl;
     foreach (const QVariant &v, vl) {
         QBS_ASSERT(v.canConvert<QString>(), continue);
@@ -834,7 +832,7 @@ QStringList PropertyMap::getModulePropertiesAsStringList(const QString &moduleNa
 QVariant PropertyMap::getModuleProperty(const QString &moduleName,
                                         const QString &propertyName) const
 {
-    return Internal::PropertyFinder().propertyValue(d->m_map->value(), moduleName, propertyName);
+    return d->m_map->moduleProperty(moduleName, propertyName);
 }
 
 static QString mapToString(const QVariantMap &map, const QString &prefix)
-- 
cgit v1.2.3