Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile fix for symbian
  license doc updated for libtiff 3.9.2
  Our configuration and build modifications to libtiff
  Add libtiff 3.9.2
  Update license doc, .pro file and qjpeghandler for libjpeg 8
  Our configuration and build modifications to libjpeg
  Add libjpeg 8
  Delete libjpeg 6b
  Delete libtiff 3.8.2

1 files changed, 85 insertions, 40 deletions

diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index dec95d0..af3fc93 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)
@@ -299,11 +305,52 @@
 
     \hr
 
-    Copyright (c) 1988-1997 Sam Leffler\br
-    Copyright (c) 1991-1997 Silicon Graphics, Inc.\br
-    Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\br
-    Copyright (c) 1997 Greg Ward Larson
+    Copyright (c) 1987, 1993, 1994
+    The Regents of the University of California.  All rights reserved.
+    
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+    
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    \hr
 
+    Copyright (C) 1988-1997 Sam Leffler
+    Copyright (C) 1991-1997 Silicon Graphics, Inc.
+    Copyright (c) Joris Van Damme <info@awaresystems.be>
+    Copyright (c) AWare Systems <http://www.awaresystems.be/>
+    Portions Copyright (C) 1985-1987, 1990 Regents of the University of California
+    Portions Copyright (C) 1990, 1991 Digital Equipment Corporation
+    Portions Copyright (C) 1990 Sun Microsystems, Inc.
+    Portions Copyright (C) 1990, 1995 Frank D. Cringle
+    Portions Copyright (C) 1996 BancTec AB
+    Portions Copyright (C) 1996 Mike Johnson
+    Portions Copyright (C) 1996 Pixar
+    Portions Copyright (C) 1997 Greg Ward Larson
+    Portions Copyright (C) 2000 Frank Warmerdam
+    Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
+    Copyright (c( 1996 USAF Phillips Laboratory
+    Additions (c) Richard Nolde 2006-2009 
+    
     Permission to use, copy, modify, distribute, and sell this software and 
     its documentation for any purpose is hereby granted without fee, provided
     that (i) the above copyright notices and this permission notice appear in
@@ -311,11 +358,11 @@
     Sam Leffler and Silicon Graphics may not be used in any advertising or
     publicity relating to the software without the specific, prior written
     permission of Sam Leffler and Silicon Graphics.
-
+    
     THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
     EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
     WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-
+    
     IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
     ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
     OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
@@ -325,11 +372,30 @@
 
     \hr
 
-    Copyright (c) 1996-1997 Sam Leffler\br
-    Copyright (c) 1996 Pixar\br
-    Copyright (c) 1991-1997 Silicon Graphics, Inc.\br
-    Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
+    Copyright (c) 1985, 1986 The Regents of the University of California.
+    All rights reserved.
+    
+    This code is derived from software contributed to Berkeley by
+    James A. Woods, derived from original work by Spencer Thomas
+    and Joseph Orost.
+    
+    Redistribution and use in source and binary forms are permitted
+    provided that the above copyright notice and this paragraph are
+    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
+    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
+    IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+    WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
+    \hr
+
+    Copyright (c) 1996-1997 Sam Leffler
+    Copyright (c) 1996 Pixar
+    
     Permission to use, copy, modify, distribute, and sell this software and 
     its documentation for any purpose is hereby granted without fee, provided
     that (i) the above copyright notices and this permission notice appear in
@@ -337,11 +403,11 @@
     Pixar, Sam Leffler and Silicon Graphics may not be used in any advertising or
     publicity relating to the software without the specific, prior written
     permission of Pixar, Sam Leffler and Silicon Graphics.
-
+    
     THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
     EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
     WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-
+    
     IN NO EVENT SHALL PIXAR, SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
     ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
     OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
@@ -351,28 +417,7 @@
 
     \hr
 
-    Copyright (c) 1985, 1986 The Regents of the University of California.\br
-    All rights reserved.
-
-    This code is derived from software contributed to Berkeley by
-    James A. Woods, derived from original work by Spencer Thomas
-    and Joseph Orost.
-
-    Redistribution and use in source and binary forms are permitted
-    provided that the above copyright notice and this paragraph are
-    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
-    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
-    IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-    WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-    \hr
-
-    See \c src/3rdparty/libtiff/COPYRIGHT for license details.
+    See \c src/3rdparty/libtiff/README for license details.
 
     \section1 Wintab API (\c wintab)
 
@@ -404,7 +449,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.