Merge branch 'master' into v8

Conflicts:
	src/declarative/graphicsitems/qdeclarativeitem.cpp
	src/declarative/qml/qdeclarativecontextscriptclass.cpp
	src/declarative/qml/qdeclarativeengine.cpp
	src/declarative/qml/qdeclarativeengine_p.h
	src/declarative/qml/qdeclarativeglobalscriptclass.cpp
	src/declarative/qml/qdeclarativeinclude.cpp
	src/declarative/qml/qdeclarativelistscriptclass.cpp
	src/declarative/qml/qdeclarativeobjectscriptclass.cpp
	src/declarative/qml/qdeclarativeobjectscriptclass_p.h
	src/declarative/qml/qdeclarativetypenamescriptclass.cpp
	src/declarative/qml/qdeclarativevaluetypescriptclass.cpp

1 files changed, 34 insertions, 20 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 97014032e0..87e058037f 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -7,29 +7,29 @@
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
 **
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
 **
 **
 **
@@ -2726,8 +2726,17 @@ void QDeclarativeItem::mapToItem(QDeclarativeV8Function *args) const
 /*!
     \qmlmethod Item::forceActiveFocus()
 
-    Force active focus on the item.
-    This method sets focus on the item and makes sure that all the focus scopes higher in the object hierarchy are also given focus.
+    Forces active focus on the item.
+
+    This method sets focus on the item and makes sure that all the focus scopes
+    higher in the object hierarchy are also given the focus.
+*/
+
+/*!
+    Forces active focus on the item.
+
+    This method sets focus on the item and makes sure that all the focus scopes
+    higher in the object hierarchy are also given the focus.
 */
 void QDeclarativeItem::forceActiveFocus()
 {
@@ -2746,7 +2755,12 @@ void QDeclarativeItem::forceActiveFocus()
 
   Returns the visible child item at point (\a x, \a y), which is in this
   item's coordinate system, or \c null if there is no such item.
-  */
+*/
+
+/*!
+  Returns the visible child item at point (\a x, \a y), which is in this
+  item's coordinate system, or 0 if there is no such item.
+*/
 QDeclarativeItem *QDeclarativeItem::childAt(qreal x, qreal y) const
 {
     const QList<QGraphicsItem *> children = childItems();