diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-05-12 18:50:50 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-13 15:47:18 +0000 |
commit | 8b5e5af31e7c0860f8cf4f8fa50e7b322cadca62 (patch) | |
tree | 36a7e2fc38c7571cdf7e4c6b6449754e39cb993c /src/lib/corelib/corelib.qbs | |
parent | d5dc7a2571027168d1a74cbb2578848dc843e20e (diff) |
Transform the scanner plugin manager into a true generic plugin manager
...and fit the generator plugins into this new plugin structure.
Plugins are now handled entirely by the build system in a generic manner
and no part of qbscore (code or build files) has a direct reference to
any plugin regardless of whether qbs is being built as shared or static
libraries.
Change-Id: I4a20546ce275df71083ee22c2cb67f781c4de764
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
-rw-r--r-- | src/lib/corelib/corelib.qbs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index f534cf239..eac9e709c 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -1,14 +1,11 @@ import qbs 1.0 QbsLibrary { - Depends { name: "clangcompilationdbgenerator" } - Depends { name: "visualstudiogenerator" } Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core-private", "network", "script", "xml"] } Depends { condition: qbsbuildconfig.enableProjectFileUpdates; name: "Qt.gui" } Depends { condition: qbsbuildconfig.enableUnitTests; name: "Qt.testlib" } - Depends { condition: Qt.core.staticBuild; name: "qbs_cpp_scanner" } - Depends { condition: Qt.core.staticBuild; name: "qbs_qt_scanner" } + Depends { condition: Qt.core.staticBuild; productTypes: ["qbsplugin"] } name: "qbscore" cpp.includePaths: base.concat([ ".", @@ -386,6 +383,8 @@ QbsLibrary { "projectgeneratormanager.cpp", "qbsassert.cpp", "qbsassert.h", + "qbspluginmanager.cpp", + "qbspluginmanager.h", "qbsprocess.cpp", "qbsprocess.h", "qttools.cpp", |