diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
| commit | cfe96b7c99cb12a666111c7861aba74d535adc89 (patch) | |
| tree | eda2c872b4446b8b4796162ea46c86a4ba171cc9 /doc/src/examples | |
| parent | 86eec3f6f98b387bf6a815c1a8e916965928b317 (diff) | |
| parent | 1d09376c4eec88ba94f00a4b045fc425c5f51346 (diff) | |
| download | Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.zip Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.gz Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-2/4.7
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
Diffstat (limited to 'doc/src/examples')
| -rw-r--r-- | doc/src/examples/imagegestures.qdoc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/src/examples/imagegestures.qdoc b/doc/src/examples/imagegestures.qdoc index 57479d8..3d4e467 100644 --- a/doc/src/examples/imagegestures.qdoc +++ b/doc/src/examples/imagegestures.qdoc @@ -32,8 +32,6 @@ This example shows how to enable gestures for a widget and use gesture input to perform actions. - \image imagegestures-example.png Screenshot of the Image Gestures example. - We use two classes to create the user interface for the application: \c MainWidget and \c ImageWidget. The \c MainWidget class is simply used as a container for the \c ImageWidget class, which we will configure to accept gesture input. Since we |