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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Doc: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations.
  Doc: Standardized on QtQuick for \since declarations.
  Doc: Removed whitespace.
  Modified \since command behavior slightly to handle project and version.
  Doc: Added a simple introduction to Qt and fixed links.
  Doc: Added more appropriate links to help reduce confusion.
  Doc: Removed non-ASCII characters from the documentation.
  qdoc: Fixed QTBUG-19338

13 files changed, 31 insertions, 31 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index b7fcbb5..fb1bdf6 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlproperty bool AnimatedImage::cache
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Specifies whether the image should be cached. The default value is
     true. Setting \a cache to false is useful when dealing with large images,
@@ -97,7 +97,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlproperty bool AnimatedImage::mirror
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This property holds whether the image should be horizontally inverted
     (effectively displaying a mirrored image).
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 836ad49..bd6405c 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -215,7 +215,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 
 /*!
     \qmlproperty bool BorderImage::cache
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Specifies whether the image should be cached. The default value is
     true. Setting \a cache to false is useful when dealing with large images,
@@ -224,7 +224,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 
 /*!
     \qmlproperty bool BorderImage::mirror
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This property holds whether the image should be horizontally inverted
     (effectively displaying a mirrored image).
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 0a98c01..474126d 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1420,7 +1420,7 @@ void QDeclarativeFlickable::setContentHeight(qreal h)
 /*!
     \qmlmethod Flickable::resizeContent(real width, real height, QPointF center)
     \preliminary
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Resizes the content to \a width x \a height about \a center.
 
@@ -1460,7 +1460,7 @@ void QDeclarativeFlickable::resizeContent(qreal w, qreal h, QPointF center)
 /*!
     \qmlmethod Flickable::returnToBounds()
     \preliminary
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Ensures the content is within legal bounds.
 
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 59e4cbb..20410ab 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -2615,7 +2615,7 @@ void QDeclarativeGridView::positionViewAtIndex(int index, int mode)
 /*!
     \qmlmethod GridView::positionViewAtBeginning()
     \qmlmethod GridView::positionViewAtEnd()
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Positions the view at the beginning or end, taking into account any header or footer.
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index e6bb798..9b9d680 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -473,7 +473,7 @@ QRectF QDeclarativeImage::boundingRect() const
 
 /*!
     \qmlproperty bool Image::cache
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Specifies whether the image should be cached. The default value is
     true. Setting \a cache to false is useful when dealing with large images,
@@ -482,7 +482,7 @@ QRectF QDeclarativeImage::boundingRect() const
 
 /*!
     \qmlproperty bool Image::mirror
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This property holds whether the image should be horizontally inverted
     (effectively displaying a mirrored image).
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index ccf0de0..ee2d19d 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -3444,7 +3444,7 @@ qreal QDeclarativeItem::implicitHeight() const
 /*!
     \qmlproperty real Item::implicitWidth
     \qmlproperty real Item::implicitHeight
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Defines the natural width or height of the Item if no \l width or \l height is specified.
 
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 57b7dea..e75189c 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -3026,7 +3026,7 @@ void QDeclarativeListView::positionViewAtIndex(int index, int mode)
 /*!
     \qmlmethod ListView::positionViewAtBeginning()
     \qmlmethod ListView::positionViewAtEnd()
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Positions the view at the beginning or end, taking into account any header or footer.
 
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 18f008a..0e06a4c 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -419,7 +419,7 @@ void QDeclarativeMouseArea::setEnabled(bool a)
 
 /*!
     \qmlproperty bool MouseArea::preventStealing
-    \since Quick 1.1
+    \since QtQuick 1.1
     This property holds whether the mouse events may be stolen from this
     MouseArea.
 
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index f3d1a68..483cad4 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -584,7 +584,7 @@ QDeclarativeRow::QDeclarativeRow(QDeclarativeItem *parent)
 
 /*!
     \qmlproperty enumeration Row::layoutDirection
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This property holds the layoutDirection of the row.
 
@@ -878,7 +878,7 @@ void QDeclarativeGrid::setFlow(Flow flow)
 
 /*!
     \qmlproperty enumeration Grid::layoutDirection
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This property holds the layout direction of the layout.
 
@@ -1236,7 +1236,7 @@ void QDeclarativeFlow::setFlow(Flow flow)
 
 /*!
     \qmlproperty enumeration Flow::layoutDirection
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This property holds the layout direction of the layout.
 
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index 813c255..e881b96 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -128,7 +128,7 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
 
 /*!
     \qmlsignal Repeater::onItemAdded(int index, Item item)
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This handler is called when an item is added to the repeater. The \a index
     parameter holds the index at which the item has been inserted within the
@@ -137,7 +137,7 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
 
 /*!
     \qmlsignal Repeater::onItemRemoved(int index, Item item)
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This handler is called when an item is removed from the repeater. The \a index
     parameter holds the index at which the item was removed from the repeater,
@@ -306,7 +306,7 @@ int QDeclarativeRepeater::count() const
 
 /*!
     \qmlmethod Item Repeater::itemAt(index)
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Returns the \l Item that has been created at the given \a index, or \c null
     if no item exists at \a index.
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 91c12d2..6d1b15d 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -1213,7 +1213,7 @@ void QDeclarativeText::setWrapMode(WrapMode mode)
 
 /*!
     \qmlproperty int Text::lineCount
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Returns the number of lines visible in the text item.
 
@@ -1229,7 +1229,7 @@ int QDeclarativeText::lineCount() const
 
 /*!
     \qmlproperty bool Text::truncated
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Returns true if the text has been truncated due to \l maximumLineCount
     or \l elide.
@@ -1246,7 +1246,7 @@ bool QDeclarativeText::truncated() const
 
 /*!
     \qmlproperty int Text::maximumLineCount
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Set this property to limit the number of lines that the text item will show.
     If elide is set to Text.ElideRight, the text will be elided appropriately.
@@ -1480,7 +1480,7 @@ qreal QDeclarativeText::paintedHeight() const
 
 /*!
     \qmlproperty real Text::lineHeight
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Sets the line height for the text.
     The value can be in pixels or a multiplier depending on lineHeightMode.
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 42c520c..15a3cae 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -107,7 +107,7 @@ TextEdit {
 
 /*!
     \qmlsignal TextEdit::onLinkActivated(string link)
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This handler is called when the user clicks on a link embedded in the text.
     The link must be in rich text or HTML format and the
@@ -616,7 +616,7 @@ void QDeclarativeTextEdit::setWrapMode(WrapMode mode)
 
 /*!
     \qmlproperty int TextEdit::lineCount
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Returns the total number of lines in the textEdit item.
 */
@@ -710,7 +710,7 @@ void QDeclarativeTextEdit::moveCursorSelection(int pos)
 
 /*!
     \qmlmethod void TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters)
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Moves the cursor to \a position and updates the selection according to the optional \a mode
     parameter. (To only move the cursor, set the \l cursorPosition property.)
@@ -1075,7 +1075,7 @@ void QDeclarativeTextEdit::setSelectByMouse(bool on)
 
 /*!
     \qmlproperty enum TextEdit::mouseSelectionMode
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Specifies how text should be selected using a mouse.
 
@@ -1221,7 +1221,7 @@ void QDeclarativeTextEditPrivate::focusChanged(bool hasFocus)
 
 /*!
     \qmlmethod void TextEdit::deselect()
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Removes active text selection.
 */
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index f68f1c6..05a15d6 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1014,7 +1014,7 @@ int QDeclarativeTextInput::positionAt(int x) const
 
 /*!
     \qmlmethod int TextInput::positionAt(int x, CursorPosition position = CursorBetweenCharacters)
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     This function returns the character position at
     x pixels from the left of the textInput. Position 0 is before the
@@ -1402,7 +1402,7 @@ QVariant QDeclarativeTextInput::inputMethodQuery(Qt::InputMethodQuery property)
 
 /*!
     \qmlmethod void TextInput::deselect()
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Removes active text selection.
 */
@@ -1574,7 +1574,7 @@ void QDeclarativeTextInput::setSelectByMouse(bool on)
 
 /*!
     \qmlproperty enum TextInput::mouseSelectionMode
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Specifies how text should be selected using a mouse.
 
@@ -1622,7 +1622,7 @@ void QDeclarativeTextInput::moveCursorSelection(int position)
 
 /*!
     \qmlmethod void TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters)
-    \since Quick 1.1
+    \since QtQuick 1.1
 
     Moves the cursor to \a position and updates the selection according to the optional \a mode
     parameter.  (To only move the cursor, set the \l cursorPosition property.)