diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-10-25 13:08:44 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-10-26 09:48:37 +0000 |
| commit | 73ad0198179604067c2d6ebcc2e658e12d576010 (patch) | |
| tree | 5dc70488eb45b545c4c2e9e6b2d7f3f68c355be6 | |
| parent | 73a12fc655305d15e44e99e3f2cd29b708433a41 (diff) | |
| download | qbs-73ad0198179604067c2d6ebcc2e658e12d576010.tar.gz | |
capnp: Make outputDir variable public
To be consistent with protobuf
Change-Id: Ib31956797f7b1ebcf37ab511dee502436900d899
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | doc/reference/modules/capnprotocpp-module.qdoc | 10 | ||||
| -rw-r--r-- | share/qbs/modules/capnproto/capnproto.js | 2 | ||||
| -rw-r--r-- | share/qbs/modules/capnproto/capnprotobase.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/capnproto/cpp/capnprotocpp.qbs | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/doc/reference/modules/capnprotocpp-module.qdoc b/doc/reference/modules/capnprotocpp-module.qdoc index 6e40d7686..c3c8660c9 100644 --- a/doc/reference/modules/capnprotocpp-module.qdoc +++ b/doc/reference/modules/capnprotocpp-module.qdoc @@ -103,6 +103,16 @@ */ /*! + \qmlproperty string capnproto.cpp::outputDir + \readonly + + The directory where the \c capnpc compiler generated files are placed. + + The value of this property is automatically set by \QBS and cannot be + changed by the user. +*/ + +/*! \qmlproperty bool capnproto.cpp::useRpc Use this property to enable support for the RPC framework. diff --git a/share/qbs/modules/capnproto/capnproto.js b/share/qbs/modules/capnproto/capnproto.js index dff379321..64464f42c 100644 --- a/share/qbs/modules/capnproto/capnproto.js +++ b/share/qbs/modules/capnproto/capnproto.js @@ -47,7 +47,7 @@ function validatePlugin(name, path) { } function getOutputDir(module, input) { - var outputDir = module._outputDir; + var outputDir = module.outputDir; var importPaths = module.importPaths; if (importPaths.length !== 0) { var canonicalInput = File.canonicalFilePath(FileInfo.path(input.filePath)); diff --git a/share/qbs/modules/capnproto/capnprotobase.qbs b/share/qbs/modules/capnproto/capnprotobase.qbs index e557f7b77..2dcb6c7e2 100644 --- a/share/qbs/modules/capnproto/capnprotobase.qbs +++ b/share/qbs/modules/capnproto/capnprotobase.qbs @@ -41,7 +41,7 @@ Module { property pathList importPaths: [] - property string _outputDir: product.buildDirectory + "/capnp" + readonly property string outputDir: product.buildDirectory + "/capnp" Probes.BinaryProbe { id: compilerProbe diff --git a/share/qbs/modules/capnproto/cpp/capnprotocpp.qbs b/share/qbs/modules/capnproto/cpp/capnprotocpp.qbs index e8c61dc89..f33bc9a48 100644 --- a/share/qbs/modules/capnproto/cpp/capnprotocpp.qbs +++ b/share/qbs/modules/capnproto/cpp/capnprotocpp.qbs @@ -40,7 +40,7 @@ CapnProtoBase { pluginName: "capnpc-c++" - cpp.systemIncludePaths: _outputDir + cpp.systemIncludePaths: outputDir cpp.cxxLanguageVersion: "c++14" Rule { |