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: (35 commits)
  Make Text, TextInput, and TextEdit all have the same size for the same text.
  More generated images in anticipation of QT-3574
  Remove deprecated Flickable.flickDirection
  Revert "Fix exponential behavior of QTextCursor::removeSelectedText"
  Prevent a recursive debug output loop when writing to the logger widget.
  Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursors
  Convert QtDeclarative def files to use LF line endings
  Update QtDeclarative def files
  doc improvements
  Changing currentIndex shouldn't cancel a flick unnecessarily.
  Fix input methods for TextInput elements with key handlers
  Document the QML enumeration basic type
  Fix TextEdit with no color property defined is drawn with wrong color
  Export QDeclarativePixmap
  doc
  Fix inconsistent reporting of module import errors when using versions.
  Make declarative pixmap cache easier to use
  Prepare for QTest persistent store for visual tests.
  Loosen font-sensitive test.
  Set correct license header.
  ...

1 files changed, 0 insertions, 3 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
index 47746c6..44f2bcf 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -74,7 +74,6 @@ class Q_AUTOTEST_EXPORT QDeclarativeFlickable : public QDeclarativeItem
     Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
     Q_PROPERTY(bool flickingHorizontally READ isFlickingHorizontally NOTIFY flickingHorizontallyChanged)
     Q_PROPERTY(bool flickingVertically READ isFlickingVertically NOTIFY flickingVerticallyChanged)
-    Q_PROPERTY(FlickableDirection flickDirection READ flickDirection WRITE setFlickDirection NOTIFY flickableDirectionChanged) // deprecated
     Q_PROPERTY(FlickableDirection flickableDirection READ flickableDirection WRITE setFlickableDirection NOTIFY flickableDirectionChanged)
 
     Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged)
@@ -147,8 +146,6 @@ public:
     QDeclarativeItem *contentItem();
 
     enum FlickableDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 };
-    FlickableDirection flickDirection() const; // deprecated
-    void setFlickDirection(FlickableDirection); // deprecated
     FlickableDirection flickableDirection() const;
     void setFlickableDirection(FlickableDirection);