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: (89 commits)
  Compile with user defined Qt namespace
  Fix regression from previous commit
  Import "content" with as qualifier to support network without qmldir
  Small fixes to photoviewer demo
  Fix benchmark.
  Add basic QUrl benchmarks.
  Add busy indicator to photoviewer demo
  Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange
  fix installation of imports libraries
  QDeclarative::isWritable optimization.
  Make easing docs more consistent with other grouped property docs.
  Make the loader a focusscope.
  Fix typo.
  Use reliable local server for HTTP testing.
  Fix installation of imports libraries
  Change PathView offset property to use range 0 - 1.0
  Tweak benchmark
  Optimization: Use linked list for context children
  Add new declarative photoviewer demo
  Remove dead code
  ...

1 files changed, 0 insertions, 12 deletions

diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 4b1c7d3..9f6be12 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -182,18 +182,6 @@ This function returns a color 50% darker than \c baseColor. See QColor::darker()
     \image declarative-rect_tint.png
 
     Tint is most useful when a subtle change is intended to be conveyed due to some event; you can then use tinting to more effectively tune the visible color.
-\section3 Qt.closestAngle(number fromAngle, number toAngle)
-This function returns an equivalent angle to toAngle, such that the difference between fromAngle and toAngle is never more than 180 degrees. This is useful when animating angles using a NumberAnimation, which does not know about equivalent angles, when you always want to take the shortest path. 
-
-For example, the following would rotate myItem counterclockwise from 350 degrees to 10 degrees, for a total of 340 degrees of rotation.
-\qml
-NumberAnimation { target: myItem; property: "rotation"; from: 350; to: 10 }
-\endqml
-
-while the following would rotate myItem clockwise from 350 degrees to 370 degrees (which is visually equivilant to 10 degrees), for a total of 20 degrees of rotation.
-\qml
-NumberAnimation { target: myItem; property: "rotation"; from: 350; to: Qt.closetAngle(350, 10) }
-\endqml
 
 \section3 Qt.openUrlExternally(url target)
 This function attempts to open the specified \c target url in an external application, based on the user's desktop preferences. It will return true if it succeeds, and false otherwise.