Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	doc/src/legal/licenses.qdoc

Change-Id: Ic88b2eb429c090587ced870be293bbef55574e05

3 files changed, 41 insertions, 8 deletions

diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 749b16f7..79524c71 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -564,6 +564,32 @@
     and related or neighboring rights to the source code.
     http://creativecommons.org/publicdomain/zero/1.0/
 
+    \hr
+
+    Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved.
+
+    LICENSE TERMS
+
+    The redistribution and use of this software (with or without changes)
+    is allowed without the payment of fees or royalties provided that:
+
+    1. source code distributions include the above copyright notice, this
+       list of conditions and the following disclaimer;
+
+    2. binary distributions include the above copyright notice, this list
+       of conditions and the following disclaimer in their documentation;
+
+    3. the name of the copyright holder is not used to endorse products
+       built using this software without specific written permission.
+
+    DISCLAIMER
+
+    This software is provided 'as is' with no explicit or implied warranties
+    in respect of its properties, including, but not limited to, correctness
+    and/or fitness for purpose.
+
+    -- quoted from \c qtbase/src/3rdparty/sha3/brg_endian.h
+
     \section1 SQLite (sqlite) version 3.8.5.0
 
     \e{SQLite is a small C library that implements a
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index c1ad61d6..788da704 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -116,6 +116,8 @@
          \li GBK is an extension of the GB2312 character set for simplified Chinese characters, used mainland China. \li BSD-style \li
     \row \li \l{Big5 Text Codec}
          \li Big5, or BIG-5, is a Chinese character encoding method used for Traditional Chinese characters. \li BSD-style \li
+    \row \li \l{Big5-HKSCS Text Codec}
+         \li Big5-HKSCS is a Chinese character set with more than 4700 characters. \li BSD-style \li
     \row \li \l{TSCII Text Codec}
          \li The TSCII codec provides conversion to and from the Tamil TSCII encoding. \li BSD-style \li
     \row \li \l{Stack-less Just-In-Time compiler}
@@ -152,7 +154,6 @@
          \li zlib is a general purpose data compression library. \li BSD-style \li
     \row \li \l{The Public Suffix List}
          \li A list of all known public Internet suffixes. \li Mozilla Public License \li
-    \row \li \li \li \li
 
     \row \li {1,12} Qt Gui
     \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper}
@@ -265,7 +266,7 @@
     \row \li {1,4} Qt WebEngine
 
     \row \li \l[QtWebEngineCore]{Qt WebEngine Core}
-         \li \li LGPL v3 or\br LGPL v2.1 + Qt commercial license \li
+         \li \li LGPL v3 or\br GPL v2 + Qt commercial license \li
     \row \li \li \li \li
     \row \li \li \li \li
 
@@ -1098,10 +1099,13 @@
 
     \section1 The PCRE library
 
-    Copyright (c) 1997-2012 University of Cambridge\br
+    Copyright (c) 1997-2015 University of Cambridge\br
+    All rights reserved.
+
+    Copyright(c) 2009-2015 Zoltan Herczeg\br
     All rights reserved.
 
-    Copyright(c) 2009-2012 Zoltan Herczeg\br
+    Copyright (c) 2007-2012, Google Inc.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 2680685d..ecd8ef40 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -332,12 +332,15 @@
 
     As described in the \l Multimedia overview, Qt Multimedia uses the GStreamer multimedia
     framework as the backend for audio and video playback on Linux. The minimum required
-    version of GStreamer is 0.10.
+    version of GStreamer is 0.10.24. The 1.x series is also supported.
 
     To build Qt Multimedia, you need the GStreamer library, base plugins, and development
-    files for your system. The package names for GStreamer vary between Linux
-    distributions; try searching for \c gstreamer or \c libgstreamer in your
-    distribution's package repository to find suitable packages.
+    files for your system. To run applications that use Qt Multimedia, you might also need to
+    install the following GStreamer plugins: 'good', 'ugly', 'bad', ffmpeg (0.10), and libav (1.x).
+    These additional plugins contain various codecs for audio and video decoding, as well as the
+    necessary components for using the camera APIs. The package names for GStreamer vary between
+    Linux distributions; try searching for \c gstreamer or \c libgstreamer in your distribution's
+    package repository to find suitable packages.
 
     \section1 Qt WebEngine Dependencies