diff --git a/doc/src/overview/creator-design-overview.qdoc b/doc/src/overview/creator-design-overview.qdoc index ea1f2b40824..180ea7e0a49 100644 --- a/doc/src/overview/creator-design-overview.qdoc +++ b/doc/src/overview/creator-design-overview.qdoc @@ -42,6 +42,9 @@ You can either create Qt Quick projects from scratch or import existing projects to \QC. You can use the code editor (Edit mode) or the visual editor (Design mode) to develop Qt Quick applications. + However, the visual editor only supports Qt Quick 1, which is + offered in Qt 5 only for compatibility with Qt 4. We recommend that + you use Qt Quick 2 for new Qt 5 applications. \o \l{Developing Widget Based Applications} Widgets and forms created with \QD are integrated seamlessly with diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-tutorials.qdoc index 2da9c556e96..a4531bfd862 100644 --- a/doc/src/overview/creator-tutorials.qdoc +++ b/doc/src/overview/creator-tutorials.qdoc @@ -38,9 +38,9 @@ \list - \o \l{Creating a Qt Quick Application} + \o \l{Creating a Qt Quick 1 Application} - Learn about the basic Qt Quick concepts and QML elements. + Learn how to use \QMLD to create a Qt Quick 1 application. \o \l{Creating a Qt Widget Based Application} diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc index 06d64b55239..d8b3b99e065 100644 --- a/doc/src/qtquick/qtquick-app-development.qdoc +++ b/doc/src/qtquick/qtquick-app-development.qdoc @@ -36,7 +36,7 @@ You can use the code editor (\l{Working in Edit Mode}{Edit mode}) or the visual editor (\l{Using Qt Quick Designer}{Design mode}) to develop Qt Quick - applications. + applications.However, the visual editor only supports Qt Quick 1. Typically, application development proceeds as follows: diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index 408132f5381..a08b139104e 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -28,12 +28,16 @@ \page creator-qml-application.html \nextpage creator-writing-program.html - \title Creating a Qt Quick Application + \title Creating a Qt Quick 1 Application - \note To complete this tutorial, you must have Qt 4.7 or later installed. + \note \QMLD only supports Qt Quick 1, which is offered in Qt 5 only for + compatibility with Qt 4. We recommend that you use Qt Quick 2 for new + Qt 5 applications. You can use the code editor in the \gui Design mode to + develop Qt Quick 2 applications. For more information, see the Qt 5 + documentation. This tutorial uses built-in QML elements and illustrates basic concepts of - \l {http://qt-project.org/doc/qt-4.8/qtquick.html}{Qt Quick}. + \l {http://qt-project.org/doc/qt-4.8/qtquick.html}{Qt Quick 1}. This tutorial describes how to use the \QC to implement the \l{http://qt-project.org/doc/qt-4.8/declarative-animation-states.html} @@ -51,12 +55,13 @@ \list 1 \o Select \gui{File > New File or Project > Applications > - Qt Quick Application (Built-in Elements) > Choose}. + Qt Quick 1 Application (Built-in Elements) > Choose}. \o In the \gui{Name} field, type \bold {Transitions}. \o In the \gui {Create in} field, enter the path for the project files. - For example, \c {C:\Qt\examples}, and then click \gui{Next}. + For example, \c {C:\Qt\examples}, and then click \gui{Next} (on + Windows and Linux) or \gui Continue (on Mac OS). \o Select \l{glossary-buildandrun-kit}{kits} for running and building your project, and then click \gui{Next}. @@ -67,10 +72,10 @@ \o Select \gui Next in the following dialogs to use the default settings. - \o Review the project settings, and click \gui{Finish} to create the - project. + \o Review the project settings, and click \gui{Finish} (on Windows and + Linux) or \gui Done (on Mac OS) to create the project. - \o Press \key {Ctrl+R} to run the application. + \o Press \key {Ctrl+R} (or \key {Cmd+R})to run the application. \endlist diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index 70e582e6540..2f308f52ee9 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -32,6 +32,8 @@ You can edit .qml files in the \QMLD visual editor or in the code editor. + \note \QMLD only supports Qt Quick 1. + In \gui Projects, double-click a .qml file to open it in the code editor. Then select the \gui {Design} mode to edit the file in the visual editor.