diff options
author | Richard Weickelt <richard@weickelt.de> | 2019-10-29 16:45:02 +0100 |
---|---|---|
committer | Richard Weickelt <richard@weickelt.de> | 2019-10-29 16:45:02 +0100 |
commit | d26db17396a89b8a2a0eb52b422f9af4ea0a76a1 (patch) | |
tree | 390046988fe9c9fc68cec29c4d23a4fed316dd07 /doc | |
parent | c743186550d23d85cafe1983d1e2d5ecdd317345 (diff) | |
parent | 4ce68dd8dd4a012545a5d7f19039840e416ddfc3 (diff) |
Merge branch 1.15 into master
Change-Id: Iac392a921b5be14f94c8500a057d7045f76db0bf
Diffstat (limited to 'doc')
-rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index 4ef1e4e5b..2f7f06698 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -1673,8 +1673,6 @@ \qmlproperty bool cpp::generateLinkerMapFile \since Qbs 1.13 - \baremetalproperty - Whether to auto-generate a linker map file. \defaultvalue \c{false} |