diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 10:29:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 10:29:20 (GMT) |
| commit | cb3b83e64154e9725c0c050ea32a4a632ad9f041 (patch) | |
| tree | fb8e2ff978f6fcb218d6d26ddaa631c6e5f085da /src/gui/graphicsview | |
| parent | e969212de0b2ac816a46db8897d54e9ed78d57b8 (diff) | |
| parent | ae0d4fcee9087521afe03732001a0267b06e0317 (diff) | |
| download | Qt-cb3b83e64154e9725c0c050ea32a4a632ad9f041.zip Qt-cb3b83e64154e9725c0c050ea32a4a632ad9f041.tar.gz Qt-cb3b83e64154e9725c0c050ea32a4a632ad9f041.tar.bz2 | |
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: (45 commits)
Doc: css fine tuning
Doc: Fixed a non-compiling example.
Doc: removing linebreak
Doc: correcting html template
Doc: Updated What's new in 4.7 page
Doc: Updated What's new in 4.7 page
Doc: Removing google analytics from offline docs
Doc: fixing creator bug in page footer
Doc: correcting html template - validating
Doc: fixing issues with table indent - css
Doc: Fixing style: line height, ol indent, coulmns (css3)
Doc: correcting html template
Doc: Updated the Mac requirements page.
Doc: Cleaning up the known issues page. Pointing people to check the online resources.
Added a QFormLayout snippet to the layout.qdoc and layouts.cpp
Doc: Removing section about Multimedia - playback and declarative elements. This was descoped from Qt 4.7.
Doc: Listed undoable operations in QTextDocument
Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
Doc: Note on updating proxy models with dynamic sort filters
qdoc: Fixed an html formatting error in the QML property list.
...
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 921e121..c166c30 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -6138,7 +6138,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event) << g << item.data(); } // remember the first item that received the override event - // as it most likely become a target if noone else accepts + // as it most likely become a target if no one else accepts // the override event if (!gestureTargets.contains(g) && item) gestureTargets.insert(g, item.data()); |