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, 2 insertions, 2 deletions

diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc
index b0d19e2..60359de 100644
--- a/doc/src/declarative/network.qdoc
+++ b/doc/src/declarative/network.qdoc
@@ -54,7 +54,7 @@ Network transparency is supported throughout QML, for example:
 \o WebViews - the \c url property of WebView (obviously!)
 \endlist
 
-Even QML types themselves can be on the network - if the \l {Qt Declarative UI Runtime}{qml} tool is used to load
+Even QML types themselves can be on the network - if the \l {QML Viewer} is used to load
 \tt http://example.com/mystuff/Hello.qml and that content refers to a type "World", the engine
 will load \tt http://example.com/mystuff/qmldir and resolve the type just as it would for a local file.
 For example if the qmldir file contains the line "World World.qml", it will load 
@@ -119,7 +119,7 @@ All network access from QML is managed by a QNetworkAccessManager set on the QDe
 By default, this is an unmodified Qt QNetworkAccessManager. You may set a different manager by
 providing a QDeclarativeNetworkAccessManagerFactory and setting it via
 QDeclarativeEngine::setNetworkAccessManagerFactory().
-For example, the \l {Qt Declarative UI Runtime}{qml} tool sets a QDeclarativeNetworkAccessManagerFactory which
+For example, the \l {QML Viewer} sets a QDeclarativeNetworkAccessManagerFactory which
 creates QNetworkAccessManager that trusts HTTP Expiry headers to avoid network cache checks,
 allows HTTP Pipelining, adds a persistent HTTP CookieJar, a simple disk cache, and supports proxy settings.