diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-05 10:33:43 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-05 10:33:59 +0100 |
commit | e1fd4f05b13292998dc8b2a3bf89369da5a062d9 (patch) | |
tree | ae5bb6d6344991f9bd0c456cbd97ab01081fc7b8 /src/lib/corelib/language/moduleloader.h | |
parent | 2b0f23a49fb63d091c635ce449545a4ec9f5e5cc (diff) | |
parent | 3bde712fa2c1f926720e85d20ae7fd5f9f378fef (diff) |
Merge 1.10 into master
Change-Id: I29a74f96381a1b77c6cb1959547314786690baa4
Diffstat (limited to 'src/lib/corelib/language/moduleloader.h')
-rw-r--r-- | src/lib/corelib/language/moduleloader.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h index d12944329..3dafd42de 100644 --- a/src/lib/corelib/language/moduleloader.h +++ b/src/lib/corelib/language/moduleloader.h @@ -305,7 +305,6 @@ private: static QString findExistingModulePath(const QString &searchPath, const QualifiedId &moduleName); static void setScopeForDescendants(Item *item, Item *scope); - static void forwardScopeToItemValues(Item *item, Item *scope); void overrideItemProperties(Item *item, const QString &buildConfigKey, const QVariantMap &buildConfig); void addProductModuleDependencies(ProductContext *ctx, const Item::Module &module); |