diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-07-01 21:13:49 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-03 09:40:11 +0000 |
| commit | 07c398642874c830336ac880dc9282d39fe90833 (patch) | |
| tree | f337652c0309e7832b30d7477d36cbaf374ff69c /doc | |
| parent | 20dc25f9fb4e00ec3989d729edbc6ffa61d41f7c (diff) | |
protobuf: Rename protocBinary property to compilerPath
For consistency with the cpp module
Change-Id: I16b9facc1c5befa6b8860dc1a51f8302ffac7a4d
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/protobufcpp-module.qdoc | 26 | ||||
| -rw-r--r-- | doc/reference/modules/protobufobjc-module.qdoc | 16 |
2 files changed, 33 insertions, 9 deletions
diff --git a/doc/reference/modules/protobufcpp-module.qdoc b/doc/reference/modules/protobufcpp-module.qdoc index b82ccc9f7..146bb293c 100644 --- a/doc/reference/modules/protobufcpp-module.qdoc +++ b/doc/reference/modules/protobufcpp-module.qdoc @@ -77,27 +77,39 @@ */ /*! - \qmlproperty string protobuf.cpp::grpcIncludePath + \qmlproperty string protobuf.cpp::compilerName - The path where grpc++ headers are located. Set this property to override the - default location. + The name of the protoc binary. + + \since Qbs 1.17 + \defaultvalue \c "protoc" +*/ + +/*! + \qmlproperty string protobuf.cpp::compilerPath + + The path to the protoc binary. + Use this property to override the auto-detected location. + + \since Qbs 1.17 \defaultvalue \c auto-detected */ /*! - \qmlproperty string protobuf.cpp::grpcLibraryPath + \qmlproperty string protobuf.cpp::grpcIncludePath - The path where the grpc++ library is located. Set this property to override the + The path where grpc++ headers are located. Set this property to override the default location. \defaultvalue \c auto-detected */ /*! - \qmlproperty string protobuf.cpp::protocBinary + \qmlproperty string protobuf.cpp::grpcLibraryPath - The command to invoke when compiling proto definition files. + The path where the grpc++ library is located. Set this property to override the + default location. \defaultvalue \c auto-detected */ diff --git a/doc/reference/modules/protobufobjc-module.qdoc b/doc/reference/modules/protobufobjc-module.qdoc index 07e6db759..235118e6f 100644 --- a/doc/reference/modules/protobufobjc-module.qdoc +++ b/doc/reference/modules/protobufobjc-module.qdoc @@ -53,10 +53,22 @@ */ /*! - \qmlproperty string protobuf.objc::protocBinary + \qmlproperty string protobuf.objc::compilerName - The command to invoke when compiling proto definition files. + The name of the protoc binary. + \since Qbs 1.17 + \defaultvalue \c "protoc" +*/ + +/*! + \qmlproperty string protobuf.objc::compilerPath + + The path to the protoc binary. + + Use this property to override the auto-detected location. + + \since Qbs 1.17 \defaultvalue \c auto-detected */ |