Update license doc, .pro file and qjpeghandler for libjpeg 8

In libjpeg versions >= 7, the default unit-scaling when decompressing
is given as 8/8 instead of 1/1.

1 files changed, 13 insertions, 7 deletions

diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index dec95d0c32..2794c7b8f5 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -116,9 +116,9 @@
 
     \hr
 
-    Copyright (C) 2004,2007  Red Hat, Inc.\br
-    Copyright (C) 1998-2004  David Turner and Werner Lemberg\br
-    Copyright (C) 2006  Behdad Esfahbod\br
+    Copyright (C) 2004,2007  Red Hat, Inc.\br
+    Copyright (C) 1998-2004  David Turner and Werner Lemberg\br
+    Copyright (C) 2006  Behdad Esfahbod\br
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
 
     This is part of HarfBuzz, an OpenType Layout engine library.
@@ -137,7 +137,7 @@
 
     THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
     BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+    FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
     ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
     PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
@@ -146,7 +146,7 @@
     See \c src/3rdparty/harfbuzz/COPYING.FTL and src/3rdparty/harfbuzz/COPYING.GPL
     for license details.
 
-    \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 6b
+    \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 8
 
     \e{This package contains C software to implement JPEG image compression and
     decompression.  JPEG (pronounced "jay-peg") is a standardized compression
@@ -156,6 +156,12 @@
     exactly identical to the input image.} -- quoted from \c
     src/3rdparty/libjpeg/README.
 
+    \hr
+
+    This software is based in part on the work of the Independent JPEG Group.
+
+    \hr
+
     See \c src/3rdparty/libjpeg/README for license details.
 
     \section1 MD4 (\c md4.cpp and \c md4.h)
@@ -363,7 +369,7 @@
     duplicated in all such forms and that any documentation,
     advertising materials, and other materials related to such
     distribution and use acknowledge that the software was developed
-    by the University of California, Berkeley.  The name of the
+    by the University of California, Berkeley.  The name of the
     University may not be used to endorse or promote products derived
     from this software without specific prior written permission.
     THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
@@ -404,7 +410,7 @@
     documentation for such software.
 
     THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
+    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
     REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
     OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.