From 21f3a69d4ca4d3d92bbae4b29315ddb1ec4c7e29 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Date: Wed, 5 Oct 2011 17:20:29 +0200
Subject: [PATCH] Doc: viewing tutorials while opening and creating projects.
Target selection is not necessary if only one target is installed.
Task-number: QTCREATORBUG-6237
Change-Id: I26da73aa6d0040f3d86fd485c354b40f86471245
Reviewed-on: http://codereview.qt-project.org/6037
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
.../creator-projects-build-run-tutorial.qdoc | 12 ++++++++++--
doc/src/widgets/qtdesigner-app-tutorial.qdoc | 7 +++----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
index 5f88befe8e..51f2ac98e1 100644
--- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc
+++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
@@ -44,13 +44,21 @@
\image qtcreator-gs-build-example-open.png "Selecting an example"
- \o Select targets for the project. Select at least Qt Simulator
+ \o Select \l{glossary-development-target}{targets} for the project.
+ Select at least Qt Simulator
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 You can add targets later in the \gui Projects mode.
+ \note If you have only one target installed, this dialog is
+ skipped. You can add installed targets later in the \gui Projects
+ mode.
+
+ \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 To test the application in Qt Simulator, click the \gui {Target
Selector} and select \gui {Qt Simulator}.
diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index 5a1ed0c9e1..2d0e98a845 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -43,10 +43,6 @@
\section1 Creating the Text Finder Project
- \note Create the project with two instances of \QC open and the \gui{Help}
- mode active in one of them so that you can follow these instructions while
- you work.
-
\list 1
\o Select \gui{File > New File or Project > Qt Widget Project > Qt Gui
@@ -97,6 +93,9 @@
\endlist
+ \note The project opens in the \gui Edit mode, and these instructions are
+ hidden. To return to these instructions, open the \gui Help mode.
+
The TextFinder project now contains the following files:
\list
--
GitLab