Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/text/qfontengine_mac.mm
	src/opengl/qpixmapdata_gl.cpp
	src/opengl/qwindowsurface_gl.cpp
	src/s60installs/bwins/QtOpenGLu.def
	src/s60installs/eabi/QtOpenGLu.def
	tests/auto/qtextlayout/tst_qtextlayout.cpp

4 files changed, 42 insertions, 40 deletions

diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index 316fe6b..f2ca0fd 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -68,9 +68,11 @@ the component. This function can take one or two arguments:
 \o The first is the parent for the new item. Since graphical items will not appear on the scene without a parent, it is 
   recommended that you set the parent this way. However, if you wish to set the parent later you can safely pass \c null to 
   this function. 
-\o The second is optional and is a script which assigns values to the item's properties during creation. This avoids warnings 
-  when certain properties have been bound to before they have been set by the code. Additionally, there are small performance 
-  benefits when instantiating objects in this way.
+\o The second is optional and is a map of property-value items that define initial any property values for the item.
+  Property values specified by this argument are applied to the object before its creation is finalized, avoiding
+  binding errors that may occur if particular properties must be initialized to enable other property bindings.
+  when certain properties have been bound to before they have been set by the code. Additionally, there are small
+  performance benefits when compared to defining property values and bindings after the object is created.
 \endlist
 
 Here is an example. First there is \c Sprite.qml, which defines a simple QML component:
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index a287533..80b6e72 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -51,7 +51,7 @@ to either instantiating an object instance, or assigning a property a value.
 QML relies heavily on Qt's meta object system and can only instantiate classes
 that derive from QObject. For visual element types, this will usually mean a subclass
 of QDeclarativeItem; for models used with the view elements, a subclass of QAbstractItemModel;
-and for abitrary objects with properties, a direct subclass of QObject.
+and for arbitrary objects with properties, a direct subclass of QObject.
 
 The QML engine has no intrinsic knowledge of any class types.  Instead the
 programmer must register the C++ types with their corresponding QML names.
@@ -522,7 +522,7 @@ The \c {invite()} method is similarly available if it is declared as a slot.
 \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 0
 \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 1
 
-The QML snippet shown above applies a property value source to the \c announcment property.
+The QML snippet shown above applies a property value source to the \c announcement property.
 A property value source generates a value for a property that changes over time.
 
 Property value sources are most commonly used to do animation.  Rather than
@@ -562,7 +562,7 @@ assignment fails does the engine call the \l {QDeclarativePropertyValueSource::}
 the type to also be used in contexts other than just as a value source.
 
 \l {Extending QML -  Property Value Source Example} shows the complete code used
-implement the \c HappyBirthdaySong property value source.
+to implement the \c HappyBirthdaySong property value source.
 
 \section1 Property Binding
 
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index f4359f9..e8c2124 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -41,10 +41,10 @@ PinchArea provides support for the common two finger pinch gesture.
 
 Added the following properties:
 \list
-\o lineSpacing
-\o lineCount
-\o maximumLineCount
-\o truncated
+\o \l {Text::}{lineHeight}
+\o \l {Text::}{lineCount}
+\o \l {Text::}{maximumLineCount}
+\o \l {Text::}{truncated}
 \endlist
 
 horizontalAlignment now accepts Text.AlignJustify alignment mode.
@@ -53,85 +53,88 @@ horizontalAlignment now accepts Text.AlignJustify alignment mode.
 
 Added the following properties, methods and signal handlers:
 \list
-\o canPaste
-\o lineCount
-\o deselect()
-\o moveCursorSelection(int pos, SelectionMode mode) to enable selection by word
-\o onLinkActivated(string link) 
+\o \l {TextEdit::}{canPaste}
+\o \l {TextEdit::}{lineCount}
+\o \l {TextEdit::}{deselect()}
+\o \l {TextEdit::}{moveCursorSelection()} to enable selection by word
+\o \l {TextEdit::}{onLinkActivated}
 \endlist
 
 \section2 TextInput
 
 Added the following properties and methods:
 \list
-\o canPaste
-\o deselect()
-\o moveCursorSelection(int pos, SelectionMode mode) to enable selection by word
+\o \l{TextInput::}{canPaste}
+\o \l{TextInput::}{deselect()}
+\o \l{TextInput::}{moveCursorSelection()} to enable selection by word
 \endlist
 
 \section2 Image, BorderImage and AnimatedImage
 
 Added the following properties:
 \list
-\o cache
-\o mirror
+\o \l{Image::}{cache}
+\o \l{Image::}{mirror}
 \endlist
 
 \section2 Item
 
 Added the following properties:
 \list
-\o implicitWidth and implicitHeight
+\o \l{Item::}{implicitWidth} and \l{Item::}{implicitHeight}
 \endlist
 
 \section2 Flickable
 
 Added the following methods:
 \list
-\o resizeContent(qreal w, qreal h, QPointF center)
-\o returnToBounds() 
+\o \l{Flickable::}{resizeContent()}
+\o \l{Flickable::}{returnToBounds()}
 \endlist
 
 \section2 ListView and GridView
 
 Added the following methods:
 \list
-\o positionViewAtBeginning()
-\o positionViewAtEnd() 
+\o \l{ListView::}{positionViewAtBeginning()}
+\o \l{ListView::}{positionViewAtEnd()}
 \endlist
 
-\section2 Flow, Grid, Row
+\section2 Flow, Grid and Row
 
 Added the following properties:
 \list
-\o layoutDirection
+\o \l{Flow::}{layoutDirection}
 \endlist
 
 \section2 Repeater
 
 Added the following methods and signal handlers:
 \list
-\o onItemAdded()
-\o onItemRemoved()
-\o itemAt(int index)
+\o \l{Repeater::}{onItemAdded}
+\o \l{Repeater::}{onItemRemoved}
+\o \l{Repeater::}{itemAt()}
 \endlist
 
 \section2 Component
 
-The createObject() method now accepts a map of initial property values for the created object.
+\list
+\o The \l{Component::}{createObject()} method now accepts a map of initial property values for
+the created object.
+\endlist
 
 \section2 Qt
 
-Added the following properties and methods:
 \list
-\o application.layoutDirection
-\o application.active
+\o Added the \l {QML:Qt::application}{Qt.application} object to hold generic global application
+properties.
 \endlist
 
 \section2 Other changes
 
 \list
-\o Functions can be assigned to properties from JavaScript to create property bindings
+\o Functions can be \l{Binding Properties from JavaScript}{assigned to properties from JavaScript}
+to create property bindings.
 \endlist
 
 
diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js
index cf59777..7364139 100644
--- a/doc/src/snippets/declarative/componentCreation.js
+++ b/doc/src/snippets/declarative/componentCreation.js
@@ -32,13 +32,10 @@ function createSpriteObjects() {
 //![finishCreation]
 function finishCreation() {
     if (component.status == Component.Ready) {
-        sprite = component.createObject(appWindow);
+        sprite = component.createObject(appWindow, {"x": 100, "y": 100});
         if (sprite == null) {
             // Error Handling
-        } else {
-            sprite.x = 100;
-            sprite.y = 100;
-            // ...
+            console.log("Error creating object");
         }
     } else if (component.status == Component.Error) {
         // Error Handling