diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-03 05:39:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-03 05:39:57 (GMT) |
| commit | 68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c (patch) | |
| tree | e3ae65fb615a4b06d774415fd2d742170104d9ce /doc/src | |
| parent | b7702b2dcbc36f81759dea0ad74fb19e97b2358f (diff) | |
| parent | e62f266a7642e675e9d235a1f54a6b5746500d48 (diff) | |
| download | Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.zip Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.tar.gz Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/examples.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/declarative/qmlviewer.qdoc | 8 | ||||
| -rw-r--r-- | doc/src/examples/qml-examples.qdoc | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc index 39da323..9929cfe 100644 --- a/doc/src/declarative/examples.qdoc +++ b/doc/src/declarative/examples.qdoc @@ -203,6 +203,11 @@ The examples can be found in Qt's \c examples/declarative directory. \o \l{declarative/threading/workerscript}{WorkerScript} \endlist +\section2 Screen orientation +\list +\o \l{declarative/screenorientation}{Example} +\endlist + \section2 SQL Local Storage \list \o \l{declarative/sqllocalstorage}{Example} diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc index 5efc0ce..41c4c80 100644 --- a/doc/src/declarative/qmlviewer.qdoc +++ b/doc/src/declarative/qmlviewer.qdoc @@ -197,10 +197,10 @@ Rectangle { \o \c runtime.orientation \o This property indicates the current orientation of the QML Viewer. On the -N900 platform, this property automatically updates to reflect the device's -actual orientation; on other platforms, this indicates the orientation currently -selected in the QML Viewer's \e {Settings -> Properties} menu. The -\c orientation value can be one of the following: +N900 platform and most S60 5.0-based or newer Symbian devices, this property +automatically updates to reflect the device's actual orientation; on other platforms, +this indicates the orientation currently selected in the QML Viewer's +\e {Settings -> Properties} menu. The \c orientation value can be one of the following: \list \o \c Orientation.Portrait diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index a8be401..8d3aa25 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -412,6 +412,14 @@ \endtable */ + +/*! + \title Screen orientation + \example declarative/screenorientation + + This example shows how to implement screen orientation support for your application. +*/ + /*! \title SQL Local Storage Example \example declarative/sqllocalstorage |