diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-29 01:00:55 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-29 01:00:56 +0100 |
| commit | a3fc03c13032b779f74ef496977d2e19e415227a (patch) | |
| tree | ff4c8457111c1c9631a2f7adc4938f151ac650b2 /doc | |
| parent | 94bc57213f9a8a74e9e7520de68d7bba7f42ea4c (diff) | |
| parent | 382619de6592ff9583504bd31176bf8dc51b0771 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I98b1a5a11ece3957a1115c1d9be8841759206ffe
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index 1c3d37c199..cbb4345bcd 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -483,6 +483,11 @@ */ /*! + \externalpage https://www.khronos.org/opengl/wiki/Array_Texture + \title Array Texture +*/ + +/*! \externalpage https://github.com/iksaif/qsslkey-p11 \title qsslkey example */ |