forked from qt-creator/qt-creator
Merge origin/2.6
Conflicts: src/libs/utils/fileutils.cpp src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h src/plugins/cmakeprojectmanager/cmakeproject.cpp src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp src/plugins/cmakeprojectmanager/makestep.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
This commit is contained in:
Eike Ziller
@@ -31,7 +31,7 @@
|
||||
|
||||
\title Building and Running an Example
|
||||
|
||||
You can test that your installation is successful by opening an existing
|
||||
You can test that your \QSDK installation is successful by opening an existing
|
||||
example application project.
|
||||
|
||||
\list 1
|
||||
@@ -54,37 +54,28 @@
|
||||
|
||||
\list 1
|
||||
|
||||
\o Select at least \QS and one of the mobile
|
||||
\l{glossary-buildandrun-kit}{kits} (1), Maemo 5 or
|
||||
MeeGo Harmattan, depending on the device you develop for.
|
||||
\o Select the kits \l{glossary-buildandrun-kit}{kits} (1) that
|
||||
specify the devices you develop for.
|
||||
|
||||
\o Select \gui {Configure Project} (2).
|
||||
|
||||
\endlist
|
||||
|
||||
\o To test the application in \QS, click the \gui {Kit
|
||||
Selector} and select \gui {\QS}.
|
||||
\o To check that the application code can be compiled and linked for a
|
||||
device, click the \gui {Kit Selector} and select a kit for the
|
||||
device.
|
||||
|
||||
\image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator to run on"
|
||||
\image qtcreator-kit-selector.png "Selecting a kit to build with"
|
||||
|
||||
\o Click
|
||||
\inlineimage qtcreator-run.png
|
||||
(\gui Run) to build the application and run it in \QS.
|
||||
(\gui Run) to build and run the application.
|
||||
|
||||
\o To see the compilation progress, press \key{Alt+4} to open the
|
||||
\gui {Compile Output} pane.
|
||||
|
||||
The \gui Build progress bar on the toolbar turns green when the
|
||||
project is successfully built. The application opens in
|
||||
\QS.
|
||||
|
||||
\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
|
||||
various mobile devices in the \gui {Device} field. You
|
||||
can also simulate various mobile functions and create your own
|
||||
scripts.
|
||||
project is successfully built. The application opens on the device.
|
||||
|
||||
\endlist
|
||||
|
||||
|
||||
@@ -55,14 +55,15 @@
|
||||
\o In the \gui{Name} field, type \bold {TextFinder}.
|
||||
|
||||
\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).
|
||||
|
||||
The \gui {Kit Selection} dialog opens.
|
||||
|
||||
\image qtcreator-new-project-qt-versions-qt-gui.png "Kit Selection dialog"
|
||||
|
||||
\o Select build and run \l{glossary-buildandrun-kit}{kits} for your project,
|
||||
and click \gui{Next}.
|
||||
and click \gui Next or \gui Continue.
|
||||
|
||||
\note If only one kit is specified in \gui Tools > \gui Options >
|
||||
\gui {Build & Run} > \gui Kits, this dialog is
|
||||
@@ -81,14 +82,14 @@
|
||||
\note The \gui{Header file}, \gui{Source file} and \gui{Form file}
|
||||
fields are automatically updated to match the name of the class.
|
||||
|
||||
\o Click \gui{Next}.
|
||||
\o Click \gui Next or \gui Continue.
|
||||
|
||||
The \gui{Project Management} dialog opens.
|
||||
|
||||
\image qtcreator-new-project-summary-qt-gui.png "Project Management dialog"
|
||||
|
||||
\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.
|
||||
|
||||
\endlist
|
||||
|
||||
@@ -155,9 +156,10 @@
|
||||
|
||||
\image qtcreator-textfinder-objectname.png "Changing object names"
|
||||
|
||||
\o Press \key {Ctrl+A} to select the widgets and click
|
||||
\gui{Lay out Horizontally} (or press \gui{Ctrl+H}) to apply a
|
||||
horizontal layout (QHBoxLayout).
|
||||
\o Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and
|
||||
click \gui{Lay out Horizontally} (or press \gui{Ctrl+H} on Linux or
|
||||
Windows or \key {Ctrl+Shift+H} on Mac OS) to apply a horizontal
|
||||
layout (QHBoxLayout).
|
||||
|
||||
\image qtcreator-texfinder-ui-horizontal-layout.png "Applying horizontal layout"
|
||||
|
||||
@@ -192,7 +194,7 @@
|
||||
|
||||
\endlist
|
||||
|
||||
\o Press \gui{Ctrl+S} to save your changes.
|
||||
\o Press \gui{Ctrl+S} (or \key {Cmd+S}) to save your changes.
|
||||
|
||||
\endlist
|
||||
|
||||
@@ -289,7 +291,7 @@
|
||||
\o In the \gui{Name} field, enter \bold{textfinder}.
|
||||
|
||||
\o In the \gui{Path} field, enter \c{C:\Qt\examples\TextFinder},
|
||||
and click \gui{Next}.
|
||||
and click \gui Next or \gui Continue.
|
||||
|
||||
The \gui{Project Management} dialog opens.
|
||||
|
||||
@@ -297,7 +299,8 @@
|
||||
|
||||
|
||||
\o In the \gui{Add to project} field, select \bold{TextFinder.pro}
|
||||
and click \gui{Finish} to open the file in the code editor.
|
||||
and click \gui{Finish} or \gui Done to open the file in the code
|
||||
editor.
|
||||
|
||||
\o Select \gui{Add > Add Prefix}.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user