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

Conflicts:
	src/gui/text/qtextengine.cpp
	src/gui/text/qtextengine_p.h
	src/gui/text/qtextlayout.cpp
	src/plugins/phonon/mmf/mmf.pro
	src/plugins/s60/5_0/5_0.pro
	tests/auto/qtextlayout/tst_qtextlayout.cpp

2 files changed, 7 insertions, 24 deletions

diff --git a/doc/src/declarative/righttoleft.qdoc b/doc/src/declarative/righttoleft.qdoc
index 4427798..58c266c 100644
--- a/doc/src/declarative/righttoleft.qdoc
+++ b/doc/src/declarative/righttoleft.qdoc
@@ -64,8 +64,7 @@ This default locale-based alignment can be overriden by setting the \c horizonta
 property for the text element, or by enabling layout mirroring using the \l LayoutMirroring attached
 property, which causes any explicit left and right horizontal alignments to be mirrored.
 Note that when \l LayoutMirroring is set, the \c horizontalAlignment property value remains unchanged;
-the effective alignment of the text element that takes the mirroring into account can be read from the
-\c effectiveHorizontalAlignment property.
+use the property \c LayoutMirroring.enabled instead to query whether the mirroring is in effect.
 
 \snippet doc/src/snippets/declarative/righttoleft.qml 0
 
@@ -79,9 +78,9 @@ property for controlling the horizontal direction of the layouts. Setting \c lay
 the left-to-right layout direction.
 
 The horizontal layout direction can also be reversed through the \l LayoutMirroring attached property.
-This causes the effective \c layoutDirection of positioners and views to be mirrored. Note the actual value
-of the \c layoutDirection property will remain unchanged; the effective layout direction of positioners and
-views that takes the mirroring into account can be read from the \c effectiveLayoutDirection property.
+This causes the effective \c layoutDirection of positioners and views to be mirrored. Note though that the actual
+value of the \c layoutDirection property will remain unchanged; use the property \c LayoutMirroring.enabled instead
+to query whether the mirroring is in effect.
 
 \snippet doc/src/snippets/declarative/righttoleft.qml 1
 
@@ -101,12 +100,8 @@ Or set all child elements to also inherit the layout direction:
 \snippet doc/src/snippets/declarative/righttoleft.qml 3
 
 Applying mirroring in this manner does not change the actual value of the relevant anchor,
-\c layoutDirection or \c horizontalAlignment properties. The separate read-only property
-\c effectiveLayoutDirection can be used to query the effective layout
-direction of positioners and model views that takes the mirroring into account. Similarly the \l Text,
-\l TextInput and \l TextEdit elements have gained the read-only property \c effectiveHorizontalAlignment
-for querying the effective visual alignment of text. For anchors, the read only
-\l {Item::anchors}{anchors.mirrored} property reflects whether anchors have been mirrored.
+\c layoutDirection or \c horizontalAlignment properties. You can use \c LayoutMirroring.enabled to
+query whether the mirroring is in effect.
 
 Note that application layouts and animations that are defined using \l {Item::}{x} property values (as
 opposed to anchors or positioner elements) are not affected by the \l LayoutMirroring attached property.
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index 9e13e98..77f8eb0 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -41,13 +41,6 @@ PinchArea provides support for the common two finger pinch gesture.
 
 \l {LayoutMirroring}{Layout mirroring} is useful when you need to support both left-to-right and right-to-left layout versions of your application that target different language areas.
 
-\section2 Anchors
-
-Added the following property:
-\list
-\o \l {Item::}{anchors.mirrored}
-\endlist
-
 \section2 Text
 
 Added the following properties:
@@ -57,7 +50,6 @@ Added the following properties:
 \o \l {Text::}{lineCount}
 \o \l {Text::}{maximumLineCount}
 \o \l {Text::}{truncated}
-\o \l {Text::}{effectiveHorizontalAlignment}
 \endlist
 
 horizontalAlignment now accepts Text.AlignJustify alignment mode.
@@ -70,7 +62,6 @@ Added the following properties, methods and signal handlers:
 \o \l {TextEdit::}{lineCount}
 \o \l {TextEdit::}{inputMethodComposing}
 \o \l {TextEdit::}{mouseSelectionMode}
-\o \l {TextEdit::}{effectiveHorizontalAlignment}
 \o \l {TextEdit::}{deselect()}
 \o \l {TextEdit::}{isRightToLeft()}
 \o \l {TextEdit::}{moveCursorSelection()} to enable selection by word
@@ -84,7 +75,6 @@ Added the following properties and methods:
 \o \l {TextInput::}{canPaste}
 \o \l {TextInput::}{inputMethodComposing}
 \o \l {TextInput::}{mouseSelectionMode}
-\o \l {TextInput::}{effectiveHorizontalAlignment}
 \o \l {TextInput::}{deselect()}
 \o \l {TextInput::}{isRightToLeft()}
 \o \l {TextInput::}{moveCursorSelection()} to enable selection by word
@@ -125,17 +115,15 @@ Added the following property:
 Added the following properties and methods:
 \list
 \o \l{ListView::}{layoutDirection}
-\o \l{ListView::}{effectiveLayoutDirection}
 \o \l{ListView::}{positionViewAtBeginning()}
 \o \l{ListView::}{positionViewAtEnd()}
 \endlist
 
 \section2 Flow, Grid and Row
 
-Added the following properties:
+Added the following property:
 \list
 \o \l{Flow::}{layoutDirection}
-\o \l{Flow::}{effectiveLayoutDirection}
 \endlist
 
 \section2 Repeater