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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties

1 files changed, 1 insertions, 13 deletions

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