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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  add autotest for QString::setRawData()
  Fixed case of a library file name to enable MinGW builds on Fedora.
  Doc: Made Qt::TextLongestVariant internal again.
  Doc: Fixed minor documentation issues.
  Doc: Reorganized the platform and compiler notes pages.
  Doc: Removed non-ASCII characters and reformatted the text.
  Doc: Fixed documentation style and qdoc warnings.
  Doc: Fixed qdoc warnings.
  Doc: Fixed qdoc warnings.
  Doc: Fixed snippet reference for the Getting Started QML guide.
  Doc: Fixed warnings caused by an earlier change. Made docs consistent.
  Doc: Fixed warnings caused by an earlier change. Made docs consistent.
  Doc: Renamed an external reference to work around an auto-linking issue.
  Doc: Fixed qdoc warnings.
  Doc: Fixed links to the online BSD license information.
  Doc: Fixed qdoc warnings.
  Doc: Re-added a link to the Qt site related to testing tools.
  Doc: Marked some new properties as internal for now.
  Doc: Renamed a project file.
  Doc: Added missing examples and snippets.

3 files changed, 30 insertions, 3 deletions

diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index b5ca812..a9612a2 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -1366,7 +1366,7 @@ bool QAbstractItemView::dragEnabled() const
 
     Note that the model used needs to provide support for drag and drop operations.
 
-    \sa setDragDropMode() {Using drag & drop with item views}
+    \sa setDragDropMode() {Using drag and drop with item views}
 */
 
 /*!
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index 5725a22..e3339c4 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -260,6 +260,27 @@ QGesture::GestureCancelPolicy QGesture::gestureCancelPolicy() const
 
 /*!
     \property QPanGesture::acceleration
+    \brief the acceleration in the motion of the touch point for this gesture
+*/
+
+/*!
+    \property QPanGesture::horizontalVelocity
+    \brief the horizontal component of the motion of the touch point for this
+    gesture
+    \since 4.7.1
+    \internal
+
+    \sa verticalVelocity, acceleration
+*/
+
+/*!
+    \property QPanGesture::verticalVelocity
+    \brief the vertical component of the motion of the touch point for this
+    gesture
+    \since 4.7.1
+    \internal
+
+    \sa horizontalVelocity, acceleration
 */
 
 /*!
@@ -633,6 +654,12 @@ void QPinchGesture::setRotationAngle(qreal value)
 */
 
 /*!
+    \property QSwipeGesture::velocity
+    \since 4.7.1
+    \internal
+*/
+
+/*!
     \internal
 */
 QSwipeGesture::QSwipeGesture(QObject *parent)
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index 36a3147..f2e8fd2 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -832,11 +832,11 @@ QString QDateTimeEdit::sectionText(Section section) const
   This format is the same as the one used described in QDateTime::toString()
   and QDateTime::fromString()
 
-  Example format strings(assuming that the date is 2nd of July 1969):
+  Example format strings (assuming that the date is 2nd of July 1969):
 
   \table
   \header \i Format \i Result
-  \row \i dd.MM.yyyy    \i 02.07.1969
+  \row \i dd.MM.yyyy \i 02.07.1969
   \row \i MMM d yy \i Jul 2 69
   \row \i MMMM d yy \i July 2 69
   \endtable