Document third-party components by their upstream name

Also use a paragraph from the upstream documentation for
third-party code that missed it so far.

Change-Id: I2609d32eafca9810116f7a9ac2df9221541acb15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

2 files changed, 43 insertions, 14 deletions

diff --git a/README.md b/README.md
index d7a702f3d7..b30250bcc1 100644
--- a/README.md
+++ b/README.md
@@ -309,7 +309,10 @@ we thank the authors who made this possible:
 
   With backported/additional patches from https://code.qt.io/clang/llvm-project.git
 
-### Reference implementation for std::experimental::optional
+### Optional
+
+  A single-header header-only library for representing optional (nullable)
+  objects for C++14 (and C++11 to some extent) and passing them by value.
 
   https://github.com/akrzemi1/Optional
 
@@ -324,7 +327,9 @@ we thank the authors who made this possible:
   The idea and interface is based on Boost.Optional library
   authored by Fernando Luis Cacciola Carballal
 
-### Implementation for std::variant
+### MPark.Variant
+
+  MPark.Variant is an implementation of C++17 std::variant for C++11/14/17.
 
   https://github.com/mpark/variant
 
@@ -335,7 +340,11 @@ we thank the authors who made this possible:
   Distributed under the Boost Software License, Version 1.0.
   (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
 
-### Implementation for std::span
+### std::span implementation for C++11 and later
+
+  A single-header implementation of C++20's std::span, conforming to the C++20
+  committee draft. It is compatible with C++11, but will use newer language
+  features if they are available.
 
   https://github.com/tcbrindle/span
 
@@ -395,7 +404,10 @@ we thank the authors who made this possible:
   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-### SQLite, in-process library that implements a SQL database engine
+### SQLite (version 3.8.10.2)
+
+SQLite is a C-language library that implements a small, fast, self-contained,
+high-reliability, full-featured, SQL database engine.
 
 SQLite (https://www.sqlite.org) is in the Public Domain.
 
@@ -487,7 +499,7 @@ SQLite (https://www.sqlite.org) is in the Public Domain.
   from Florian Loitsch which is licensed under the MIT License (see above).
   Copyright © 2009 Florian Loitsch
 
-### Minitrace
+### minitrace
 
   Simple C/C++ library for producing JSON traces.
 
diff --git a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
index 4ec9eb9ea2..2e6b71d0f7 100644
--- a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
+++ b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
@@ -385,7 +385,11 @@
             \li \l{http://code.qt.io/cgit/clang/clang.git}
             \endlist
 
-        \li \b{Reference implementation for std::experimental::optional}
+        \li \b{Optional}
+
+            A single-header header-only library for representing optional
+            (nullable) objects for C++14 (and C++11 to some extent) and passing
+            them by value.
 
             Copyright (C) 2011-2012 Andrzej Krzemienski
 
@@ -404,7 +408,9 @@
             \li \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/src/libs/3rdparty/optional}
             \endlist
 
-        \li \b{Implementation for std::variant}
+        \li \b{MPark.Variant}
+
+            MPark.Variant is an implementation of C++17 std::variant for C++11/14/17.
 
             Copyright Michael Park, 2015-2017
 
@@ -419,7 +425,11 @@
             \li \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/src/libs/3rdparty/variant}
             \endlist
 
-        \li \b{Implementation for std::span}
+        \li \b{std::span implementation for C++11 and later}
+
+            A single-header implementation of C++20's std::span, conforming to
+            the C++20 committee draft. It is compatible with C++11, but will use
+            newer language features if they are available.
 
             Copyright Tristan Brindle, 2018
 
@@ -613,7 +623,10 @@
         OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         \endcode
 
-        \li \b{SQLite, an embedded database. Version 3.8.10.2}\br\br
+        \li \b{SQLite (version 3.8.10.2)}
+
+        SQLite is a C-language library that implements a small, fast,
+        self-contained, high-reliability, full-featured, SQL database engine.
 
         The author or authors of this code dedicate any and all copyright
         interest in this code to the public domain. We make this dedication
@@ -628,11 +641,15 @@
         \li  \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/src/libs/3rdparty/sqlite}
         \endlist
 
-        \li \b{three.js (license MIT)}\br
-        Copyright (C) 2010-2015 three.js authors\br
+        \li \b{three.js}
+
+        Copyright (C) 2010-2015 three.js authors
+
+        MIT License.
+
         share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication
 
-        \li \b{OpenSSL toolkit}
+        \li \b{OpenSSL}
 
         The OpenSSL toolkit stays under a double license, i.e. both the conditions of
         the OpenSSL License and the original SSLeay license apply to the toolkit.
@@ -753,7 +770,7 @@
         [including the GNU Public Licence.]
         \endcode
 
-        \li \b{Mesa LLVMPipe, 3D graphics library}
+        \li \b{LLVMPipe - The Mesa 3D Graphics Library}
 
         Mesa is a 3D graphics library with an API which is very similar to that
         of OpenGL. The llvmpipe software renderer enables the running of OpenGL
@@ -826,7 +843,7 @@
         from Florian Loitsch which is licensed under the MIT License (see above).
         Copyright (C) 2009 Florian Loitsch
 
-        \li \b Minitrace
+        \li \b minitrace
 
         Simple C/C++ library for producing JSON traces.