diff --git a/doc/images/qt-simulator.png b/doc/images/qt-simulator.png index e59eb9ff3dcb4d7c3a26ff1aa96525d1aa7bb48f..d426598c73b8cbb7ceb6a77eb62feee3268420d8 100644 Binary files a/doc/images/qt-simulator.png and b/doc/images/qt-simulator.png differ diff --git a/doc/images/qtcreator-gs-build-example-open.png b/doc/images/qtcreator-gs-build-example-open.png index 059e7a135eabfe90ebef40a20151c691812c01e9..30177fe07b32091ae72a17c8987336b84debe963 100644 Binary files a/doc/images/qtcreator-gs-build-example-open.png and b/doc/images/qtcreator-gs-build-example-open.png differ diff --git a/doc/images/qtcreator-gs-build-example-select-qs.png b/doc/images/qtcreator-gs-build-example-select-qs.png index 3d4c51928ab72de41fdd08ad43863d25f01ae1d7..8f0ec3caf4faf77fc4e2465b0aac6c3d318d3493 100644 Binary files a/doc/images/qtcreator-gs-build-example-select-qs.png and b/doc/images/qtcreator-gs-build-example-select-qs.png differ diff --git a/doc/images/qtcreator-gs-build-example-targets.png b/doc/images/qtcreator-gs-build-example-targets.png index 652282263783ed31e761bafb7e5f92a1e8968db6..9047b93d204436585b4fcc91229047df155ade74 100644 Binary files a/doc/images/qtcreator-gs-build-example-targets.png and b/doc/images/qtcreator-gs-build-example-targets.png differ diff --git a/doc/src/overview/creator-getting-started.qdoc b/doc/src/overview/creator-getting-started.qdoc index b8b31406613e7400d3b2f1639b00e9ae2c46f36b..ecfce510c598643a1739e4d7355e4ee13e4e6d12 100644 --- a/doc/src/overview/creator-getting-started.qdoc +++ b/doc/src/overview/creator-getting-started.qdoc @@ -49,12 +49,12 @@ If you have not used \QC before, and want to become familiar with the parts of the user interface, go to \l{User Interface}. - \o \bold {\l{Building and Running an Example Application}} + \o \bold {\l{Building and Running an Example}} To check that \l{glossary-development-target}{targets} were successfully installed as part of the \QSDK installation, open an example application and run it. If you have not done so - before, go to \l{Building and Running an Example Application}. + before, go to \l{Building and Running an Example}. \o \bold {\l{Tutorials}} Now you are ready to start developing your own applications. diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc index 8f01d175115ca1619cee646fd54a05dbafecab51..f5454e49ab3873371d9df63ea4015cf2a0c70a9d 100644 --- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc +++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc @@ -31,43 +31,48 @@ \page creator-build-example-application.html \nextpage creator-tutorials.html - \title Building and Running an Example Application + \title Building and Running an Example You can test that your installation is successful by opening an existing example application project. \list 1 - \o On the \gui Welcome page, select \gui {Demos and Examples}, - and then search for \gui {Toys: Clocks Example} in the - list of examples. + \o On the \gui Welcome page, select \gui Examples (1). \image qtcreator-gs-build-example-open.png "Selecting an example" - \o Select \l{glossary-development-target}{targets} for the project. - Select at least \QS - and one of the mobile targets, Symbian Device, Maemo 5, or - MeeGo Harmattan, depending on the device you develop for. - - \image qtcreator-gs-build-example-targets.png "Selecting targets" - - \note If you have only one target installed, this dialog is - skipped. You can add installed targets later in the \gui Projects - mode. + \o Search for \gui {Toys: Clocks Example} (2) in the list of examples + and select it (3). \note The project opens in the \gui Edit mode, and the documentation for the example hides these instructions. To return to these instructions, select \gui {Previous Page} on the toolbar or press \key {Alt+Left}. + \o Select \gui Projects to configure the project: + + \image qtcreator-gs-build-example-targets.png "Selecting targets" + + \list 1 + + \o Select at least \QS and one of the mobile + \l{glossary-development-target}{targets} (1), Symbian + Device, Maemo 5, or MeeGo Harmattan, depending on the device + you develop for. + + \o Select \gui {Configure Project} (2). + + \endlist + \o To test the application in \QS, click the \gui {Target Selector} and select \gui {\QS}. - \image {qtcreator-gs-build-example-select-qs.png} "Selecting Qt Simulator as target" + \image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator as target" \o Click - \inlineimage{qtcreator-run.png} - to build the application and run it in \QS. + \inlineimage qtcreator-run.png + (\gui Run) to build the application and run it in \QS. \o To see the compilation progress, press \key{Alt+4} to open the \gui {Compile Output} pane. @@ -76,7 +81,7 @@ project is successfully built. The application opens in \QS. - \image {qt-simulator.png} "Qt Simulator" + \image qt-simulator.png "Qt Simulator" \o Change the settings in the \gui Model view. For example, rotate the device by clicking the \gui {Orientation} buttons or choose from the diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index faf687b7ebec56e2d492dbe16b5233e2fe7106be..ccce4c309980f536f837c1436026c4850bb09ddc 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -48,7 +48,7 @@ \list \o \l{IDE Overview} \o \l{User Interface} - \o \l{Building and Running an Example Application} + \o \l{Building and Running an Example} \o \l{Tutorials} \endlist \o \bold {\l{Managing Projects}} @@ -132,7 +132,7 @@ \list \o \l{IDE Overview} \o \l{User Interface} - \o \l{Building and Running an Example Application} + \o \l{Building and Running an Example} \o \l{Tutorials} \list \o \l{Creating a Qt Quick Application}