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: (231 commits)
  Fixed compile warning on Windows.
  Fixed painter path drawing on FBO without stencil buffer.
  qmake: Make smart library merge architecture-aware
  Slovenian translation: some updates and fixes
  Fixed memory leak in Symbian when Options menu was launched.
  Fixed color of cosmetic pens when printing under Windows.
  Fixed infinite loop when loading jpeg without EOI from memory.
  Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).
  Added galician translation
  Support multisampled pbuffers under Windows.
  tst_qpixmapfilter:  Fix compilation in namespace
  qtextcodec_symbian: Add few aliases
  Give a warning in QPixmap::handle() if pixmap is not X11 class.
  Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
  Fix one hang of QNAM on Symbian.
  Update QtDeclarative def files
  Update QtGui def files
  Update QtCore bwins def file
  Fix Symbian def file for a9e5329168
  Make build on Symbian
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index fb1a1d6..8dd2db7 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()) {