diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-04 11:54:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-04 11:54:13 (GMT) |
| commit | dac42b0d66eda9a7101847ced61c118024ef9c6d (patch) | |
| tree | c6d1f6a17ad54be4cd0092bded2ca513cd5f2b78 /doc/src/examples/qml-webbrowser.qdoc | |
| parent | 76aad35bd9f699c966295738095d245a5e7a6457 (diff) | |
| parent | b68a5d2cd6b08504b354b09465ab05593120fee8 (diff) | |
| download | Qt-dac42b0d66eda9a7101847ced61c118024ef9c6d.zip Qt-dac42b0d66eda9a7101847ced61c118024ef9c6d.tar.gz Qt-dac42b0d66eda9a7101847ced61c118024ef9c6d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't write to the logger widget while the application is closing down.
Fix exponential behavior of QTextCursor::removeSelectedText
Fix test for N900 (ARM-specific SVG results).
docs - fix doc links, minor improvements
Fix TextEdit bitmap tests testing the wrong element
Make autotests work with qreal == float (in addition to double).
Fix TextInput text getting improperly clipped
fix doc links
Fix docs to link to the new QML Viewer page instead of the Runtime page
qmlviewer: Update the proxy factory when the user changes the proxy.
Don't accept *files* that exist when *directory* is required.
Diffstat (limited to 'doc/src/examples/qml-webbrowser.qdoc')
| -rw-r--r-- | doc/src/examples/qml-webbrowser.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/qml-webbrowser.qdoc b/doc/src/examples/qml-webbrowser.qdoc index da6f600..d322b02 100644 --- a/doc/src/examples/qml-webbrowser.qdoc +++ b/doc/src/examples/qml-webbrowser.qdoc @@ -40,7 +40,7 @@ ****************************************************************************/ /*! - \title Web Browser + \title QML Web Browser \example demos/declarative/webbrowser This demo shows how to write a simple web browser in QML by combining the |