diff options
author | Peter Yard <peter.yard@nokia.com> | 2012-02-21 15:58:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 04:07:09 +0100 |
commit | cd5a8fc69d7acec07b03dc43a6a6f2bf9afa9952 (patch) | |
tree | 994b72beee2e1d642cd58b2e9b6389a7f701eff6 /doc/src/legal/trademarks.qdoc | |
parent | e791e4f0e9d51e25d1cc547e8b48771008831099 (diff) |
Docs: fix qml links and standalone build for Multimedia
Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'doc/src/legal/trademarks.qdoc')
-rw-r--r-- | doc/src/legal/trademarks.qdoc | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc deleted file mode 100644 index 1adbb0a6a..000000000 --- a/doc/src/legal/trademarks.qdoc +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page trademarks.html - - \title Trademarks - \ingroup licensing - \brief Information about trademarks owned by Nokia and other organisations. - - Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia \reg - Corporation and/or its subsidiaries in Finland and other countries. - - \list - \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of - Intel Corporation in the United States, other countries, or both. - \o Java and all Java-based trademarks are trademarks of Sun Microsystems, - Inc. in the United States, other countries, or both. - \o Linux is a \reg trademark of Linus Torvalds in the United States, other - countries or both. - \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc., - registered in the U.S. and other countries. - \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo - are \reg trademarks of Microsoft Corporation in the United States, other - countries, or both. - \o Motif is a registered trademark of The Open Group in the United States, - other countries, or both. - \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States - and other countries. - \o UNIX is a registered trademark of The Open Group in the United States - and other countries. - \o Versit is a \reg trademark of the Internet Mail Consortium in the United States - and other countries. - \o All other company, product, or service names may be trademarks or - service marks of others and are the property of their respective owners. - The use of the word partner does not imply a partnership relationship - between Nokia and any other company. - \endlist -*/ |