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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
  update Russian translations for Qt and tools
  Updated Slovenian translations for Qt 4.7
  doc: The QML Qt element was missing from the documentation.
  64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
  QXmlStreamReader: avoid unnecessary detaching
  QSslCertificate: support expiration dates > 2049
  Doc: Fixing typo
  Doc: Fixing bug involving header misplacement in Creator style
  qdoc: Added list of all members (including inherited) page to QML elements.
  qdoc: Ensured that text is encoded correctly.
  qdoc: Fixed non-well-formed markup.
  Doc: Fixed typo in a shortcut string.
  Remove useless QString::clear() from QSharedData example snippet.
  Move note on connectToBus() not actually being able to reconnect to
  Doc: Added more license information.

4 files changed, 164 insertions, 10 deletions

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index c2930b3..c008404 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -114,6 +114,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \row \o \l {Component} \o Encapsulate QML items as a component
 \row \o \l {Timer} \o Provides timed triggers 
 \row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property
+\row \o \l {QML:Qt} {Qt} \o The QML global Qt object provides useful enums and functions from Qt.
 \row \o \l {WorkerScript} \o Enables the use of threads in QML
 \row \o \l {Loader} \o Controls the loading of items or components
 \row \o \l {Repeater} \o Uses a model to create multiples of components
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index a04a256..12aca6b 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -262,14 +262,14 @@
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:\br
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.\br
-        * 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.\br
-        * Neither the name of Research In Motion Limited nor the
-          names of its contributors may be used to endorse or promote products
-          derived from this software without specific prior written permission.
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.\br
+      * 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.\br
+      * Neither the name of Research In Motion Limited 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 Research In Motion Limited ''AS IS'' AND ANY
     EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -476,6 +476,24 @@
 
     \hr
 
+    Copyright 2001, 2002 Catharon Productions Inc.
+
+    This file is part of the Catharon Typography Project and shall only
+    be used, modified, and distributed under the terms of the Catharon
+    Open Source License that should come with this file under the name
+    `CatharonLicense.txt'.  By continuing to use, modify, or distribute
+    this file you indicate that you have read the license and
+    understand and accept it fully.
+
+    Note that this license is compatible with the FreeType license.
+
+    \list
+    \o Included in the build system of the FreeType library
+    \o See \l{CatharonLicense.txt} for more information
+    \endlist
+
+    \hr
+
     Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.\br
     Copyright (C) 2007 Eric Seidel <eric@webkit.org>\br
     Copyright (C) 2008 Kelvin W Sherlock (ksherlock@gmail.com)\br
@@ -987,3 +1005,15 @@
     and have given a quick thought about whether Roman might perhaps be interested
     to read what you did with his stuff. Horizontal rules don't apply.}
 */
+
+/*!
+    \page catharon-license.html
+    \title CatharonLicense.txt
+    \ingroup licensing
+    \brief The Catharon License used in parts of FreeType.
+
+    See the \l{Other Licenses Used in Qt} document for information on the
+    context in which this license is applied to code in the FreeType library.
+
+    \quotefile doc/src/snippets/legal/CatharonLicense.txt
+*/
diff --git a/doc/src/snippets/legal/CatharonLicense.txt b/doc/src/snippets/legal/CatharonLicense.txt
new file mode 100644
index 0000000..789c8c9
--- /dev/null
+++ b/doc/src/snippets/legal/CatharonLicense.txt
@@ -0,0 +1,123 @@
+                  The Catharon Open Source LICENSE
+                    ----------------------------
+
+                            2000-Jul-04
+
+          Copyright (C) 2000 by Catharon Productions, Inc.
+
+
+
+Introduction
+============
+
+  This  license  applies to  source  files  distributed by  Catharon
+  Productions,  Inc.  in  several  archive packages.   This  license
+  applies  to all files  found in  such packages  which do  not fall
+  under their own explicit license.
+
+  This  license   was  inspired  by  the  BSD,   Artistic,  and  IJG
+  (Independent JPEG  Group) licenses, which  all encourage inclusion
+  and  use of  free  software in  commercial  and freeware  products
+  alike.  As a consequence, its main points are that:
+
+    o We  don't promise that  this software works.  However,  we are
+      interested in any kind of bug reports. (`as is' distribution)
+
+    o You can  use this software for whatever you  want, in parts or
+      full form, without having to pay us. (`royalty-free' usage)
+
+    o You may not pretend that  you wrote this software.  If you use
+      it, or  only parts of it,  in a program,  you must acknowledge
+      somewhere  in  your  documentation  that  you  have  used  the
+      Catharon Code. (`credits')
+
+  We  specifically  permit  and  encourage  the  inclusion  of  this
+  software, with  or without modifications,  in commercial products.
+  We disclaim  all warranties  covering the packages  distributed by
+  Catharon  Productions, Inc.  and  assume no  liability related  to
+  their use.
+
+
+Legal Terms
+===========
+
+0. Definitions
+--------------
+
+  Throughout this license,  the terms `Catharon Package', `package',
+  and  `Catharon  Code'  refer   to  the  set  of  files  originally
+  distributed by Catharon Productions, Inc.
+
+  `You' refers to  the licensee, or person using  the project, where
+  `using' is a generic term including compiling the project's source
+  code as  well as linking it  to form a  `program' or `executable'.
+  This  program  is referred  to  as `a  program  using  one of  the
+  Catharon Packages'.
+
+  This  license applies  to all  files distributed  in  the original
+  Catharon  Package(s),  including  all  source code,  binaries  and
+  documentation,  unless  otherwise  stated   in  the  file  in  its
+  original, unmodified form as  distributed in the original archive.
+  If you are  unsure whether or not a particular  file is covered by
+  this license, you must contact us to verify this.
+
+  The  Catharon   Packages  are  copyright  (C)   2000  by  Catharon
+  Productions, Inc.  All rights reserved except as specified below.
+
+1. No Warranty
+--------------
+
+  THE CATHARON PACKAGES ARE PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
+  KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
+  WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR
+  PURPOSE.  IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OF OR THE INABILITY TO
+  USE THE CATHARON PACKAGE.
+
+2. Redistribution
+-----------------
+
+  This  license  grants  a  worldwide, royalty-free,  perpetual  and
+  irrevocable right  and license to use,  execute, perform, compile,
+  display,  copy,   create  derivative  works   of,  distribute  and
+  sublicense the  Catharon Packages (in both source  and object code
+  forms)  and  derivative works  thereof  for  any  purpose; and  to
+  authorize others  to exercise  some or all  of the  rights granted
+  herein, subject to the following conditions:
+
+    o Redistribution  of source code  must retain this  license file
+      (`license.txt') unaltered; any additions, deletions or changes
+      to   the  original   files  must   be  clearly   indicated  in
+      accompanying  documentation.   The  copyright notices  of  the
+      unaltered, original  files must be preserved in  all copies of
+      source files.
+
+    o Redistribution  in binary form must provide  a disclaimer that
+      states  that the  software is  based in  part on  the  work of
+      Catharon Productions, Inc. in the distribution documentation.
+
+  These conditions  apply to any  software derived from or  based on
+  the Catharon Packages, not just  the unmodified files.  If you use
+  our work, you  must acknowledge us.  However, no  fee need be paid
+  to us.
+
+3. Advertising
+--------------
+
+  Neither Catharon Productions, Inc.  and contributors nor you shall
+  use  the  name  of  the  other  for  commercial,  advertising,  or
+  promotional purposes without specific prior written permission.
+
+  We suggest, but do not  require, that you use the following phrase
+  to refer to this software in your documentation: 'this software is
+  based in part on the Catharon Typography Project'.
+
+  As  you have  not signed  this license,  you are  not  required to
+  accept  it.  However,  as  the Catharon  Packages are  copyrighted
+  material, only  this license, or  another one contracted  with the
+  authors, grants you  the right to use, distribute,  and modify it.
+  Therefore,  by  using,  distributing,  or modifying  the  Catharon
+  Packages,  you indicate  that you  understand and  accept  all the
+  terms of this license.
+
+--- end of license.txt ---
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index d6b0fda..6a32e53 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1375,7 +1375,7 @@
    .creator .wrapper
     {
 	position:relative;
-	top:50px;
+	top:5px;
     }
     .creator .wrapper .bd
 	{
@@ -1486,7 +1486,7 @@
 
 
 
-	  position:fixed;
+	/*  position:fixed;*/
     }