diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-14 11:59:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-14 12:44:59 +0200 |
| commit | d9ee09673540c84ef18d4bbd008d3a045c8bf7c4 (patch) | |
| tree | dfd2a33ad46704753084757d241f9dc392345e74 /src/lib/corelib/language | |
| parent | b8b9759d55cb90322899fcec644f72d03dfdf6f0 (diff) | |
remove superfluous parameter from ModuleLoader::load
Change-Id: I0fe591139749f01a4dcaf97633b592c774b18918
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/language')
| -rw-r--r-- | src/lib/corelib/language/loader.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 5 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/corelib/language/loader.cpp b/src/lib/corelib/language/loader.cpp index e0748d18c..622cfa073 100644 --- a/src/lib/corelib/language/loader.cpp +++ b/src/lib/corelib/language/loader.cpp @@ -120,7 +120,7 @@ TopLevelProjectPtr Loader::loadProject(const SetupProjectParameters ¶meters) cancelationTimer.start(1000); } - ModuleLoaderResult loadResult = m_moduleLoader->load(parameters, true); + ModuleLoaderResult loadResult = m_moduleLoader->load(parameters); const TopLevelProjectPtr project = m_projectResolver->resolve(loadResult, parameters); // E.g. if the top-level project is disabled. diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 4ad233f6a..4890a2eae 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -102,8 +102,7 @@ void ModuleLoader::setSearchPaths(const QStringList &searchPaths) } } -ModuleLoaderResult ModuleLoader::load(const SetupProjectParameters ¶meters, - bool wrapWithProjectItem) +ModuleLoaderResult ModuleLoader::load(const SetupProjectParameters ¶meters) { if (m_logger.traceEnabled()) m_logger.qbsTrace() << "[MODLDR] load" << parameters.projectFilePath(); @@ -120,7 +119,7 @@ ModuleLoaderResult ModuleLoader::load(const SetupProjectParameters ¶meters, if (!root) return ModuleLoaderResult(); - if (wrapWithProjectItem && root->typeName() != QLatin1String("Project")) + if (root->typeName() != QLatin1String("Project")) root = wrapWithProject(root); const QString buildDirectory diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h index bc13dd1ab..c368dbf40 100644 --- a/src/lib/corelib/language/moduleloader.h +++ b/src/lib/corelib/language/moduleloader.h @@ -99,8 +99,7 @@ public: void setSearchPaths(const QStringList &searchPaths); Evaluator *evaluator() const { return m_evaluator; } - ModuleLoaderResult load(const SetupProjectParameters ¶meters, - bool wrapWithProjectItem = false); + ModuleLoaderResult load(const SetupProjectParameters ¶meters); static QString fullModuleName(const QStringList &moduleName); static void overrideItemProperties(Item *item, const QString &buildConfigKey, |