diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:05:53 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:05:53 (GMT) |
| commit | 0981f27d76436f8058d8534b7454777910922ee0 (patch) | |
| tree | 780a864cb0d9b163f15dbe9d84e64bb0dfbb9110 /doc | |
| parent | e658bcb0e64acca9684f0897510d639af98ab552 (diff) | |
| parent | 5a26fa6da1986bdb507391fd8784c51258e81d80 (diff) | |
| download | Qt-0981f27d76436f8058d8534b7454777910922ee0.zip Qt-0981f27d76436f8058d8534b7454777910922ee0.tar.gz Qt-0981f27d76436f8058d8534b7454777910922ee0.tar.bz2 | |
Merge commit 'origin/4.6' into mmfphonon
Conflicts:
demos/mediaplayer/mediaplayer.pro
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index d80308a..30dae88 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -1077,9 +1077,13 @@ \contentspage Qt Examples \nextpage D-Bus Examples + The API of the gesture framework is not yet finalized and + still subject to change. +\omit \list \o \l{widgets/imageviewer}{Image Viewer} \endlist +\endomit */ /*! diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 1fd62be..6224cd4 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -567,7 +567,8 @@ \o Enable extensibility. \endlist - See the QTouchEvent and QGesture class documentation for more information. + See the QTouchEvent class documentation for more information. The + Gesture framework API is still subject to change. \section1 DOM access API |