diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-12 10:44:27 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-12 11:32:04 +0200 |
| commit | 31ae0405127e6794b96eb52902a0515493695630 (patch) | |
| tree | 39605394091ec12b27bbb9ca7797d3966fc516d8 /src/lib/corelib/language/moduleloader.h | |
| parent | c14e9d3d56a5fe5820077fde28289e6f2f484026 (diff) | |
Give the whole SetupProjectParameters to the ModuleLoader.
Makes the load() function signature simpler, and we will need
additional data from the SetupProjectParameters object later.
Change-Id: If02f7510c00158da84994cc732e08361f2e491e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/language/moduleloader.h')
| -rw-r--r-- | src/lib/corelib/language/moduleloader.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h index f6f62a2c3..bc13dd1ab 100644 --- a/src/lib/corelib/language/moduleloader.h +++ b/src/lib/corelib/language/moduleloader.h @@ -33,6 +33,7 @@ #include "forward_decls.h" #include "itempool.h" #include <logging/logger.h> +#include <tools/setupprojectparameters.h> #include <QMap> #include <QSet> @@ -98,9 +99,8 @@ public: void setSearchPaths(const QStringList &searchPaths); Evaluator *evaluator() const { return m_evaluator; } - ModuleLoaderResult load(const QString &filePath, - const QVariantMap &overriddenProperties, const QVariantMap &buildConfigProperties, - bool wrapWithProjectItem = false); + ModuleLoaderResult load(const SetupProjectParameters ¶meters, + bool wrapWithProjectItem = false); static QString fullModuleName(const QStringList &moduleName); static void overrideItemProperties(Item *item, const QString &buildConfigKey, @@ -198,8 +198,7 @@ private: QMap<QString, QStringList> m_moduleDirListCache; QHash<Item *, QSet<QString> > m_validItemPropertyNamesPerItem; QSet<Item *> m_disabledItems; - QVariantMap m_overriddenProperties; - QVariantMap m_buildConfigProperties; + SetupProjectParameters m_parameters; }; } // namespace Internal |