diff options
author | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
commit | 387f5a70065b6a21143f30a693b3946f43145aa1 (patch) | |
tree | 19499220eb78ffc2b83174768e4db33f36d33242 /doc | |
parent | c9afad98efee2e9d7eb09407395c8ad00f175f17 (diff) | |
parent | 9820278a708024cc1ae01372dfafabe4ff295b88 (diff) | |
download | qt-creator-387f5a70065b6a21143f30a693b3946f43145aa1.tar.gz |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/findusages/tst_findusages.cpp
Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/howto/creator-external-tools.qdoc | 14 | ||||
-rw-r--r-- | doc/src/overview/creator-advanced.qdoc | 3 | ||||
-rw-r--r-- | doc/src/projects/creator-projects-creating.qdoc | 11 | ||||
-rw-r--r-- | doc/src/qtquick/qtquick-creating.qdoc | 3 |
4 files changed, 19 insertions, 12 deletions
diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc index ac1f5faf92..2ea158b022 100644 --- a/doc/src/howto/creator-external-tools.qdoc +++ b/doc/src/howto/creator-external-tools.qdoc @@ -31,7 +31,7 @@ \title Using External Tools You can use external tools directly from \QC. Qt Linguist, - QML Viewer, the + QML preview tools, the default text editor for your system, and the \c sort tool are preconfigured for use. You can change their default configurations and configure new tools. @@ -59,14 +59,14 @@ \l{http://qt-project.org/doc/qt-4.8/linguist-manual.html} {Qt Linguist Manual}. - \section1 Using QML Viewer + \section1 Previewing QML Files - You can preview the current QML document in the QML Viewer. The QML Viewer - invokes the QML runtime to load QML documents and also includes additional - features useful for the development of QML-based applications. + You can preview the current QML document in the QML Viewer (Qt Quick 1) or + QML Scene (Qt Quick 2). The preview tools enable you to load QML documents + for viewing and testing while you are developing an application. - To preview the currently active QML file, select \gui {Tools > External > - Qt Quick > Preview (qmlviewer)}. + To preview the currently active QML file, select \gui Tools > \gui External + > \gui {Qt Quick} > \gui {Preview (qmlviewer)} or \gui {Preview (qmlscene)}. \section1 Using External Text Editors diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc index 12f5bbe8aa..78693a7afc 100644 --- a/doc/src/overview/creator-advanced.qdoc +++ b/doc/src/overview/creator-advanced.qdoc @@ -71,7 +71,8 @@ \o \l{Using External Tools} You can use external tools directly from \QC. Qt Linguist, - QML Viewer, the default text editor for your system, and the \c sort + QML preview tools (QML Viewer and QML Scene), the default text + editor for your system, and the \c sort tool are preconfigured for use. You can change their default configurations and configure new tools. diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index e9bad37339..21b9bd5e60 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -141,8 +141,9 @@ \o Qt Quick UI - Use a single QML file that contains the main view. You can run - Qt Quick UI projects in the QML Viewer and you need not build + Use a single QML file that contains the main view. You can + review Qt Quick UI projects in a \l{Previewing QML Files} + {preview tool} and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects @@ -273,7 +274,11 @@ \o Qt resource files, which allow you to store binary files in the application executable - \o QML files, which specify elements in Qt Quick projects + \o QML files, which specify elements in Qt Quick projects. + \gui {Qt Quick 1} creates a QML file that imports Qt Quick 1.1 and + \gui {Qt Quick 2} creates a QML file that imports Qt Quick 2.0. + Select \gui {Qt Quick 1} to add files to a Qt Quick 1 application + and \gui {Qt Quick 2} to add files to a Qt Quick 2 application. \o JavaScript files that you can use to write the application logic in Qt Quick projects diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 7c0635faf7..a8dcf90f2b 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -59,7 +59,8 @@ develop for platforms that run Qt 5. \o \gui {Qt Quick UI} creates a Qt Quick UI project with a single QML file that contains the main view. You can review Qt Quick UI - projects in the QML Viewer and you need not build them. You do not + projects in a \l{Previewing QML Files}{preview tool} and you need + not build them. You do not need to have the development environment installed on your computer to create and run this type of project. |