diff --git a/doc/images/qmldesigner-tutorial-desing-mode.png b/doc/images/qmldesigner-tutorial-desing-mode.png index 068f63bdfea718372774b120853eecca824f7962..87c0f97e4f0cc3ee16c0bf2cf98b5f78b924d8f0 100644 Binary files a/doc/images/qmldesigner-tutorial-desing-mode.png and b/doc/images/qmldesigner-tutorial-desing-mode.png differ diff --git a/doc/images/qmldesigner-tutorial-page.png b/doc/images/qmldesigner-tutorial-page.png index 0613bf4f5af7a4537130399ad852b52635f6d381..e2c8ed1bfb7dcc78e4b04ab0be431fd4c2ca8b74 100644 Binary files a/doc/images/qmldesigner-tutorial-page.png and b/doc/images/qmldesigner-tutorial-page.png differ diff --git a/doc/images/qmldesigner-tutorial-project.png b/doc/images/qmldesigner-tutorial-project.png index d1f945f9d6fad618555b4147ce2681fa4c3a6c0c..0162b669ba4ee76053b57306bdad59a9138d9b3a 100644 Binary files a/doc/images/qmldesigner-tutorial-project.png and b/doc/images/qmldesigner-tutorial-project.png differ diff --git a/doc/images/qmldesigner-tutorial-quick-toolbar.png b/doc/images/qmldesigner-tutorial-quick-toolbar.png index b63f4a6c22506f0f2cf73df79b62f31f9965db8b..29f9faea7c45b40b91ebdb701b20111d22c6e79b 100644 Binary files a/doc/images/qmldesigner-tutorial-quick-toolbar.png and b/doc/images/qmldesigner-tutorial-quick-toolbar.png differ diff --git a/doc/images/qmldesigner-tutorial-state1.png b/doc/images/qmldesigner-tutorial-state1.png index 6ece7203ff1c337fed77fb00e32a1ea5ea1faae7..4ee85b3f445199cd1c19cbdd40fa238510f66e39 100644 Binary files a/doc/images/qmldesigner-tutorial-state1.png and b/doc/images/qmldesigner-tutorial-state1.png differ diff --git a/doc/images/qmldesigner-tutorial-topleftrect.png b/doc/images/qmldesigner-tutorial-topleftrect.png index 0cb48d7e25570501e1eee77ba37b33d0f6967c24..81298d3e3c582680f67690fc13e6e346c20b239b 100644 Binary files a/doc/images/qmldesigner-tutorial-topleftrect.png and b/doc/images/qmldesigner-tutorial-topleftrect.png differ diff --git a/doc/images/qmldesigner-tutorial-user-icon.png b/doc/images/qmldesigner-tutorial-user-icon.png index 6d7570801d801654d87ff8a879e8d392b3a4e296..d45deae99385962cacdb3c850e0dd5d8b0e94000 100644 Binary files a/doc/images/qmldesigner-tutorial-user-icon.png and b/doc/images/qmldesigner-tutorial-user-icon.png differ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index ee3d10cce56c1b46c1d0bbb037c39582ecefdf05..73c29cc3088e7b036d2ff46d64a274871ca3d199 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -6585,16 +6585,19 @@ \image qmldesigner-tutorial.png "States and transitions example" + For more information about using \QMLD, see + \l{Developing Qt Quick Applications}. + \section1 Creating the Project \list 1 - \o Select \gui{File > New File or Project > Qt Quick Project > Qt Quick UI > - Choose}. + \o Select \gui{File > New File or Project > Qt Quick Project > Qt Quick + Application > Choose}. \o Follow the instructions of the wizard to create a project called Transitions. - \o Press \key {Ctrl+R} to run the application in the QML Viewer. + \o Press \key {Ctrl+R} to run the application. \endlist @@ -6616,7 +6619,7 @@ \list 1 - \o In the \gui Projects view, double-click the main .qml file (Transitions.qml) + \o In the \gui Projects view, double-click the main.qml file to open it in the code editor. \o Click \gui Design to open the file in \QMLD. @@ -6634,7 +6637,7 @@ \o In the \gui Id field, enter \e page, to be able to reference the rectangle from other places. - \o In the \gui Colors tab, \gui Rectangle field, set the color to #343434. + \o In the \gui Colors group, \gui Rectangle field, set the color to #343434. \endlist @@ -6665,13 +6668,13 @@ \o In the \gui Size field, set \gui W and \gui H to 64, for the rectangle size to match the image size. - \o In the \gui Colors tab, \gui Rectangle field, click the + \o In the \gui Colors group, \gui Rectangle field, click the \inlineimage qmldesigner-transparent-button.png button to make the rectangle transparent. \o In the \gui Border field, set the border color to #808080. - \o In the \gui Rectangle tab, \gui Border field, set the border width to + \o In the \gui Rectangle group, \gui Border field, set the border width to 1. \note If the \gui Border field does not appear after you set the border @@ -6769,7 +6772,7 @@ \o Press \key {Ctrl+S} to save the changes. - \o Press \key {Ctrl+R} to run the application in the QML Viewer. + \o Press \key {Ctrl+R} to run the application. \endlist @@ -6803,7 +6806,7 @@ \note When you set the expressions, drag and drop is disabled for the icon in \QMLD. - \o Press \key {Ctrl+R} to run the application in the QML Viewer. + \o Press \key {Ctrl+R} to run the application. \endlist @@ -6853,18 +6856,12 @@ \snippet snippets/qml/list-of-transitions.qml default transition - \o Press \key {Ctrl+R} to run the application in the QML Viewer. + \o Press \key {Ctrl+R} to run the application. \endlist Click the rectangles to view the animated transitions. - \section1 Deploying the Application to Mobile Devices - - To deploy the application to mobile devices, use the \gui {Qt Quick Application} wizard - to convert it into a Qt Quick application. For more information, see - \l{Importing QML Applications}. - */