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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
  run depend_command even if the binary has no absolute path
  fix scaleFactor/totalScaleFactor in QPinchGestureRecognizer
  Added velocity property to the QPanGesture.
  Changed the speed property on QSwipeGesture to velocity
  fix typos in comment
  unbreak test
  Don't add generic subdirs project twice.
  Remove debug, quiet warnings.
  Fix memory leaks and valgrind errors.
  QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines
  Revert "Properly implement qobject_cast for const pointers."
  Bearer management: Fix compilation with namespace.
  fetch next token after class definition opening
  delay next token fetching when opening namespace
  don't let operator overloads confuse us
  don't try to show source when no locations are given
  Implement a private API for setting title widgets
  Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry.
  fix CRLF
  Added private API to install an x11EventFilter
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 5c80340..6dd8127 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -184,7 +184,7 @@ void QGestureManager::cleanupCachedGestures(QObject *target, Qt::GestureType typ
 // get or create a QGesture object that will represent the state for a given object, used by the recognizer
 QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recognizer, Qt::GestureType type)
 {
-    // if the widget is being deleted we should be carefull and not to
+    // if the widget is being deleted we should be careful not to
     // create a new state, as it will create QWeakPointer which doesnt work
     // from the destructor.
     if (object->isWidgetType()) {