diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-12-12 10:51:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-12 10:07:24 +0100 |
| commit | cccae805eeb5994176f51d8f0129e891cba7be6a (patch) | |
| tree | 69328df977de1b36a3b1ecac7917f7b30e3a63d3 | |
| parent | c6f3d2ec9d26ae0d303d49553c9fe65070a043c8 (diff) | |
| download | qtdoc-cccae805eeb5994176f51d8f0129e891cba7be6a.tar.gz | |
Added Active X to Microsoft trademarks list
Task-number: QTBUG-27776
Change-Id: I2df6f1e29abf52944f1e70fbf533810c8dfe3204
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| -rw-r--r-- | doc/src/legal/trademarks.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc index fce6364a..382daff9 100644 --- a/doc/src/legal/trademarks.qdoc +++ b/doc/src/legal/trademarks.qdoc @@ -44,9 +44,9 @@ countries or both. \li Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc., registered in the U.S. and other countries. - \li Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio and the - Windows logo are \reg trademarks of Microsoft Corporation in the United - States, other countries, or both. + \li Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio, ActiveX + and the Windows logo are \reg trademarks of Microsoft Corporation in the + United States, other countries, or both. \li Motif is a registered trademark of The Open Group in the United States, other countries, or both. \li OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States |