aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/language/projectresolver.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/language/projectresolver.h')
-rw-r--r--src/lib/language/projectresolver.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/language/projectresolver.h b/src/lib/language/projectresolver.h
index b57a5a57e..645aeba77 100644
--- a/src/lib/language/projectresolver.h
+++ b/src/lib/language/projectresolver.h
@@ -34,6 +34,7 @@
#include "filetags.h"
#include "language.h"
#include <logging/logger.h>
+#include <tools/setupprojectparameters.h>
#include <QMap>
#include <QSet>
@@ -57,8 +58,8 @@ public:
~ProjectResolver();
void setProgressObserver(ProgressObserver *observer);
- TopLevelProjectPtr resolve(ModuleLoaderResult &loadResult, const QString &buildRoot,
- const QVariantMap &overriddenProperties, const QVariantMap &buildConfiguration);
+ TopLevelProjectPtr resolve(ModuleLoaderResult &loadResult,
+ const SetupProjectParameters &setupParameters);
private:
struct ProjectContext
@@ -121,15 +122,13 @@ private:
Logger m_logger;
ScriptEngine *m_engine;
ProgressObserver *m_progressObserver;
- QString m_buildRoot;
- QVariantMap m_overriddenProperties;
- QVariantMap m_buildConfiguration;
ProductContext *m_productContext;
ModuleContext *m_moduleContext;
QMap<QString, ResolvedProductPtr> m_productsByName;
QHash<ResolvedProductPtr, Item *> m_productItemMap;
mutable QHash<FileContextConstPtr, ResolvedFileContextPtr> m_fileContextMap;
QMap<QString, QVariantMap> m_exports;
+ SetupProjectParameters m_setupParams;
typedef void (ProjectResolver::*ItemFuncPtr)(Item *item, ProjectContext *projectContext);
typedef QMap<QByteArray, ItemFuncPtr> ItemFuncMap;