aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKai Dohmen <psykai1993@googlemail.com>2020-09-21 12:15:00 +0200
committerKai Dohmen <psykai1993@googlemail.com>2020-09-24 11:46:31 +0000
commit82020280ac9a4f9082c4390a30d41473cf401c39 (patch)
treec5dd4c185d7965e2cfec27944266b6b550ef8887 /doc
parent0d85123b3850f1df07184b018916525bc9a44e97 (diff)
Make protobuf.*.outputDir public again
Make protobuf outputDir public again for usage with installSourceBase when creating/installing a separate proto-only library product. Make outputDir readonly since it should not be set by the user. Changed artifacts tag hpp to protobuf.hpp for better filtering. Change-Id: I8697e880aacfe4d3029fd6f547a5d8c1eee7ee7e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/modules/protobufcpp-module.qdoc15
-rw-r--r--doc/reference/modules/protobufobjc-module.qdoc15
2 files changed, 30 insertions, 0 deletions
diff --git a/doc/reference/modules/protobufcpp-module.qdoc b/doc/reference/modules/protobufcpp-module.qdoc
index 146bb293c..5d2c7715d 100644
--- a/doc/reference/modules/protobufcpp-module.qdoc
+++ b/doc/reference/modules/protobufcpp-module.qdoc
@@ -73,6 +73,11 @@
\li
\li 1.14.0
\li Source files with this tag are considered as gRPC files.
+ \row
+ \li \c{"protobuf.hpp"}
+ \li
+ \li 1.18.0
+ \li This tag is attached to the header files generated by \c protoc compiler.
\endtable
*/
@@ -145,6 +150,16 @@
*/
/*!
+ \qmlproperty string protobuf.cpp::outputDir
+ \readonly
+
+ The directory where the \c protoc compiler generated files are placed.
+
+ The value of this property is automatically set by \QBS and cannot be
+ changed by the user.
+*/
+
+/*!
\qmlproperty bool protobuf.cpp::useGrpc
Whether to use gRPC framework.
diff --git a/doc/reference/modules/protobufobjc-module.qdoc b/doc/reference/modules/protobufobjc-module.qdoc
index 235118e6f..65df477f7 100644
--- a/doc/reference/modules/protobufobjc-module.qdoc
+++ b/doc/reference/modules/protobufobjc-module.qdoc
@@ -49,6 +49,11 @@
\li \c{*.proto}
\li 1.13.0
\li Source files with this tag are considered inputs to the \c protoc compiler.
+ \row
+ \li \c{"protobuf.hpp"}
+ \li
+ \li 1.18.0
+ \li This tag is attached to the header files generated by \c protoc compiler.
\endtable
*/
@@ -111,3 +116,13 @@
\defaultvalue \c auto-detected
*/
+
+/*!
+ \qmlproperty string protobuf.objc::outputDir
+ \readonly
+
+ The directory where the \c protoc compiler generated files are placed.
+
+ The value of this property is automatically set by \QBS and cannot be
+ changed by the user.
+*/