diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-15 14:55:02 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2015-06-16 08:52:25 +0000 |
| commit | bfc5201b8319329b5354ec4d2f3c5c810cd07a2a (patch) | |
| tree | 24c629841ef3246b64c70344787ff5e521483df7 | |
| parent | afde1b141ea24ee9141089d3d4bf9a8a835e3a32 (diff) | |
| download | qtdoc-bfc5201b8319329b5354ec4d2f3c5c810cd07a2a.tar.gz | |
List The Qt Company as owner of Qt trademarks
Change-Id: I97db563e7f0419417884e1dd9c56bae14bd1f088
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| -rw-r--r-- | doc/src/legal/trademarks.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc index f3878ab6..593d6fd1 100644 --- a/doc/src/legal/trademarks.qdoc +++ b/doc/src/legal/trademarks.qdoc @@ -30,12 +30,13 @@ \title Trademarks \ingroup licensing - \brief Information about trademarks owned by Digia and other organisations. + \brief Information about trademarks owned by The Qt Company and other organizations. - Digia, the Digia logo, Qt, and the Qt logo are trademarks of Digia Plc - and/or its subsidiaries in Finland and other countries. + The Qt Company Ltd and/or its subsidiaries are the owner of Qt trademarks worldwide. \list + \li Digia and the Digia logo are trademarks of Digia Plc and/or its subsidiaries + in Finland and other countries. \li Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of Intel Corporation in the United States, other countries, or both. \li Oracle and Java are registered trademarks of Oracle and/or its affiliates. |