diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:05 +0100 |
| commit | c69aae2d14732cfa74889b09474b900053581d71 (patch) | |
| tree | 2f6e055f7f46b402a9bd74e51eec0b693317f602 | |
| parent | 113e24a5aabe6917b7f3d65f342bb5fff9bc3b08 (diff) | |
| parent | 9aec0395d2ab77485984899266350c468b6b26c1 (diff) | |
| download | qtdoc-c69aae2d14732cfa74889b09474b900053581d71.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I3c295556b3abc2f3fb2f8cfda9be373fda13f695
| -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] */ |