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: (126 commits)
  Skip OpenGL threading tests on Mac as they were causing reboots
  Fixed compile of autotests.
  Fix warnings on gcc
  Add experimental VBO support for drawCachedGlyphs()'s index array
  Fix threaded gl autotest build failure on GLES2
  Removed redundant debug output from trace benchmark.
  Added two QML based traces to trace benchmark.
  Fixed old trace files no longer working.
  Reduced the memory footprint of qttrace files.
  Added trace replayer benchmark.
  Added --range and --single arguments to qttracereplay.
  Always accept values reported directly using QTest::setBenchmarkResult.
  Make threading use-cases work for X11
  Run firstRun initialization in declarative/painting benchmark
  Optimization for text drawing on OpenGL
  Enable QStaticText in QtDeclarative painting benchmark
  Fix no-webkit compiler helpviewer
  Make sure height of glyph cache is a power of two
  Fixes crash when destroying a QGraphicsItem.
  Move benchmarks/qvector to benchmarks/corelib/tools/qvector
  ...

1 files changed, 41 insertions, 1 deletions

diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index bb2effa..dec95d0 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -192,13 +192,53 @@
 
     See \c src/3rdparty/libmng/LICENSE for license details.
 
-    \section1 PNG Reference Library (\c libpng) version 1.2.29
+    \section1 PNG Reference Library (\c libpng) version 1.4.0
 
     \e{Libpng was written as a companion to the PNG specification, as a way
     of reducing the amount of time and effort it takes to support the PNG
     file format in application programs.} -- quoted from \c
     src/3rdparty/libpng/libpng.txt.
 
+    \hr
+
+    copyright (C) 1999 by Willem van Schaik <willem@schaik.com>
+    
+    version 1.0 - 1999.10.15 - First version.
+    
+    Permission to use, copy, modify, and distribute this software and
+    its documentation for any purpose and without fee is hereby granted,
+    provided that the above copyright notice appear in all copies and
+    that both that copyright notice and this permission notice appear in
+    supporting documentation. This software is provided "as is" without
+    express or implied warranty.
+    
+    \hr
+
+    Copyright (c) 1998-2001 Greg Roelofs.  All rights reserved.
+
+    This software is provided "as is," without warranty of any kind,
+    express or implied.  In no event shall the author or contributors
+    be held liable for any damages arising in any way from the use of
+    this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute
+    it freely, subject to the following restrictions:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, disclaimer, and this list of conditions.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, disclaimer, and this list of conditions in the documenta-
+       tion and/or other materials provided with the distribution.
+    3. All advertising materials mentioning features or use of this
+       software must display the following acknowledgment:
+
+          This product includes software developed by Greg Roelofs
+          and contributors for the book, "PNG: The Definitive Guide,"
+          published by O'Reilly and Associates.
+
+    \hr
+
     See \c src/3rdparty/libpng/LICENSE for license details.
 
     \section1 The ptmalloc memory allocator (\c ptmalloc3) version 1.8