From 3a1d6e59169d1ec294b0491f7f6900dc12784c06 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Tue, 25 Nov 2014 11:48:09 +0100
Subject: [PATCH] Update ANGLE section in 3rdparty licenses
Change-Id: Iacfd74e399bb93d7d64fbc08ff458546d4b0f34f
Reviewed-by: Andrew Knight <andrew.knight@theqtcompany.com>
---
doc/src/legal/licenses.qdoc | 51 ++-----------------------------------
1 file changed, 2 insertions(+), 49 deletions(-)
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 57a30e03..2bbc68d5 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -640,7 +640,7 @@
\section1 ANGLE
- Copyright (C) 2002-2010 The ANGLE Project Authors.
+ Copyright (C) 2002-2013 The ANGLE Project Authors.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -674,56 +674,9 @@
POSSIBILITY OF SUCH DAMAGE.
\list
- \li ANGLE library in qtbase/src/testlib/3rdparty/angle
+ \li ANGLE library in qtbase/src/3rdparty/angle
\endlist
- \hr
-
- Copyright (c) 2002, NVIDIA Corporation.
-
- NVIDIA Corporation("NVIDIA") supplies this software to you in
- consideration of your agreement to the following terms, and your use,
- installation, modification or redistribution of this NVIDIA software
- constitutes acceptance of these terms. If you do not agree with these
- terms, please do not use, install, modify or redistribute this NVIDIA
- software.
-
- In consideration of your agreement to abide by the following terms, and
- subject to these terms, NVIDIA grants you a personal, non-exclusive
- license, under NVIDIA's copyrights in this original NVIDIA software (the
- "NVIDIA Software"), to use, reproduce, modify and redistribute the
- NVIDIA Software, with or without modifications, in source and/or binary
- forms; provided that if you redistribute the NVIDIA Software, you must
- retain the copyright notice of NVIDIA, this notice and the following
- text and disclaimers in all such redistributions of the NVIDIA Software.
- Neither the name, trademarks, service marks nor logos of NVIDIA
- Corporation may be used to endorse or promote products derived from the
- NVIDIA Software without specific prior written permission from NVIDIA.
- Except as expressly stated in this notice, no other rights or licenses
- express or implied, are granted by NVIDIA herein, including but not
- limited to any patent rights that may be infringed by your derivative
- works or by other works in which the NVIDIA Software may be
- incorporated. No hardware is licensed hereunder.
-
- THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
- INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
- NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
- PRODUCTS.
-
- IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
- INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
- OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
- NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
- TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
- NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- \list
- \li ANGLE preprosessor in qtbase/src/testlib/3rdparty/angle/src/compiler/preprocessor
- \endlist
\section1 WebKit used by the QtWebKit module
--
GitLab