summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@nokia.com>2011-03-09 12:30:28 +0100
committerLeena Miettinen <riitta-leena.miettinen@nokia.com>2011-03-09 12:30:28 +0100
commit6adc5b123a6fc92bdf8b26e237b14c441624e2e6 (patch)
tree90605d4f7a1834f3370bf1cc0cdf8b751ab1269c
parentfdf5d5cc980514145e877ee78b21a33361ee30b7 (diff)
downloadqt-creator-6adc5b123a6fc92bdf8b26e237b14c441624e2e6.tar.gz
Doc: update run settings for Qt Quick UI projects
Task-number: QTCREATORBUG-4001 Reviewed-by: Kai Koehne
-rw-r--r--doc/images/qmldesigner-run-settings.pngbin26642 -> 25303 bytes
-rw-r--r--doc/qtcreator.qdoc27
2 files changed, 11 insertions, 16 deletions
diff --git a/doc/images/qmldesigner-run-settings.png b/doc/images/qmldesigner-run-settings.png
index 0dc1d2f764..bea676931f 100644
--- a/doc/images/qmldesigner-run-settings.png
+++ b/doc/images/qmldesigner-run-settings.png
Binary files differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index aa220ffec4..4da1e7fc4d 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -3782,30 +3782,25 @@
\image qmldesigner-run-custom-exe.png "Run settings for custom executables"
- \section1 Specifying Run Settings for Qt Quick Projects
+ \section1 Specifying Run Settings for Qt Quick UI Projects
- Select run settings in the \gui {Run configuration} field. The settings
- are specified automatically and, you mostly need to change them if you
- develop applications that use both C++ and QML:
+ You can specify run settings for the \gui Desktop target:
\list
- \o \gui {Custom QML Viewer} is the path to the \QQV executable.
- Qt Creator ships with a specific version of \QQV and imported
- modules, which is used by default. If you develop Qt Quick applications
- that contain C++ plugins, you must select the \QQV version
- shipped with your Qt version here.
+ \o In the \gui {Qt version} field, select a Qt version that has support
+ for QML.
- \o \gui {QML Viewer arguments} sets arguments for running \QQV.
- The \c{-I <directory>} argument searches for C++ or QML plugins from
- the project folder. For a list of available arguments, enter \c {qml --help}
- on the command line.
+ \o In the \gui Arguments field, you can specify command line arguments
+ to be passed to the executable.
- \o \gui {Main QML file} is the Qt Quick project file.
+ \o In the \gui {Main QML file}, select the file that \QQV will be
+ started with.
- \o \gui Debugger allows you to select the languages to debug:
+ \o In the \gui Debugger group, select the languages to debug:
\gui{C++} and \gui QML. \gui {Debug port} is the port to access \QQV.
You can use any free port in the registered port range.
+ For more information, see \l{Debugging Qt Quick Projects}.
\endlist
@@ -3814,7 +3809,7 @@
execute any JavaScript functions. Therefore, you must make sure that the port
is properly protected by a firewall.
- \image qmldesigner-run-settings.png "Run settings for Qt Quick projects"
+ \image qmldesigner-run-settings.png "Run settings for Qt Quick UI projects"
*/