summaryrefslogtreecommitdiffstats
path: root/doc/src/legal/3rdparty.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/legal/3rdparty.qdoc')
-rw-r--r--doc/src/legal/3rdparty.qdoc36
1 files changed, 34 insertions, 2 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index e53904c36..d670b89c9 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -39,7 +39,7 @@
Third Party Software may impose additional restrictions and it is the
user's responsibility to ensure that they have met the licensing
- requirements of the GPL, LGPL, or Qt Commercial license and the relevant
+ requirements of the LGPL or Qt Commercial license and the relevant
license of the Third Party Software they are using.
Run \c{configure -help} to see any options that may be available for
@@ -1751,4 +1751,36 @@
Note that this same license does *not* apply to the CLucene Contributions
package. You should read the COPYING file in that directory or package for
more information.
+
+ \section1 Wayland Protocol
+
+ \badcode
+ Copyright © 2008-2011 Kristian Høgsberg
+ Copyright © 2010-2011 Intel Corporation
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ the copyright holders not be used in advertising or publicity
+ pertaining to distribution of the software without specific,
+ written prior permission. The copyright holders make no
+ representations about the suitability of this software for any
+ purpose. It is provided "as is" without express or implied
+ warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ THIS SOFTWARE.
+ \endcode
+
+ \list
+ \li From \c {qtwayland/src/3rdparty/protocol/wayland.xml}
+ \endlist
*/