Skip to content
GitLab
Commit bfc5201b authored by Kai Koehne's avatar Kai Koehne Committed by Topi Reiniö
Browse files

List The Qt Company as owner of Qt trademarks 


Change-Id: I97db563e7f0419417884e1dd9c56bae14bd1f088
Reviewed-by: default avatarTopi Reiniö <topi.reinio@digia.com>
parent afde1b14
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 3 deletions
doc/src/legal/trademarks.qdoc
+ 4
− 3
View file @ bfc5201b
...@@ -30,12 +30,13 @@ ...@@ -30,12 +30,13 @@
\title Trademarks \title Trademarks
\ingroup licensing \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 The Qt Company Ltd and/or its subsidiaries are the owner of Qt trademarks worldwide.
and/or its subsidiaries in Finland and other countries.
\list \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 \li Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
Intel Corporation in the United States, other countries, or both. Intel Corporation in the United States, other countries, or both.
\li Oracle and Java are registered trademarks of Oracle and/or its affiliates. \li Oracle and Java are registered trademarks of Oracle and/or its affiliates.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment