diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 00:31:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 00:31:19 (GMT) |
| commit | 80de59a2f0289d3f7bbef405ed2175a64faabc96 (patch) | |
| tree | 0b47e64e30a277ffe40698405776e591280e9087 /doc/src/declarative/qmlviewer.qdoc | |
| parent | 8c01157a9056f91d40d3579bfc0eb9b81a5f99d8 (diff) | |
| parent | ac52dee57e4417ebd6f6049cfb7998fe9d62e8db (diff) | |
| download | Qt-80de59a2f0289d3f7bbef405ed2175a64faabc96.zip Qt-80de59a2f0289d3f7bbef405ed2175a64faabc96.tar.gz Qt-80de59a2f0289d3f7bbef405ed2175a64faabc96.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/declarative/qmlviewer.qdoc')
| -rw-r--r-- | doc/src/declarative/qmlviewer.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc index efff9cc..5efc0ce 100644 --- a/doc/src/declarative/qmlviewer.qdoc +++ b/doc/src/declarative/qmlviewer.qdoc @@ -42,7 +42,7 @@ deployment of QML applications. In those cases, the QML runtime should be invoke from a Qt application instead; see \l {Qt Declarative UI Runtime} for more information. -The viewer is located at QTDIR/bin/qmlviewer. To load a \c .qml file +The viewer is located at \c QTDIR/bin/qmlviewer. To load a \c .qml file with the viewer, run the viewer and select the file to be opened, or provide the file path on the command line: @@ -50,7 +50,7 @@ file path on the command line: qmlviewer myqmlfile.qml \endcode -On Mac OS X, the QML Viewer application is named \c QMLViewer.app instead. You +On Mac OS X, the QML Viewer application is named "QMLViewer" instead. You can launch the viewer by opening the QMLViewer application from the Finder, or from the command line: |