diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2018-11-16 13:51:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-11-16 13:51:14 +0000 |
| commit | 5354677e9253235881e59c838ceaaeed1d18b0f8 (patch) | |
| tree | bfb6bfe24b4f62c345ddd0008c0292d6412aa0bc | |
| parent | b6a5aff9b7781fb98529e9a4beab0c2f43ac55fe (diff) | |
| parent | c69aae2d14732cfa74889b09474b900053581d71 (diff) | |
| download | qtdoc-5354677e9253235881e59c838ceaaeed1d18b0f8.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
| -rw-r--r-- | doc/src/legal/fdl.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/platforms/apple-getting-started.qdocinc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc index 6970af0d..84f36260 100644 --- a/doc/src/legal/fdl.qdoc +++ b/doc/src/legal/fdl.qdoc @@ -35,6 +35,10 @@ Alternatively, you may use the documentation in accordance with the terms contained in a written agreement between you and The Qt Company. + Example code embedded in the Qt documentation is also + licensed under a \l{BSD 3-Clause "New" or "Revised" License}. + See \l {License of Qt examples} for further details. + The Qt Toolkit is Copyright (C) 2018 The Qt Company Ltd. and other contributors.\br Contact: \l{https://www.qt.io/licensing/} diff --git a/doc/src/platforms/apple-getting-started.qdocinc b/doc/src/platforms/apple-getting-started.qdocinc index 68fd1f41..d5a8cf44 100644 --- a/doc/src/platforms/apple-getting-started.qdocinc +++ b/doc/src/platforms/apple-getting-started.qdocinc @@ -100,8 +100,5 @@ Most useful is perhaps the possibility for adding In-App Purchasing with the StoreKit framework. - We currently have one example mixing Objective-C and C++ code. You - find it - \l{http://wiki.qt.io/Mixing_C_and_ObjectiveC_Code}{here}. //! [getting started] */ |