feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: use macro for Qt Simulator product name

Browse Source 
Change-Id: I68b7d4d2d8a6ef62f3b09aaf114b1cde94cda63b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
This commit is contained in:
Leena Miettinen
2012-01-18 15:15:57 +01:00
parent 79f7e6edfa
commit d465f2e363
15 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/config/macros.qdocconf
View File

@@ -21,6 +21,7 @@ macro.QD = "Qt Designer"
macro.QL = "Qt Linguist" macro.QL = "Qt Linguist"
macro.QMLD = "Qt Quick Designer" macro.QMLD = "Qt Quick Designer"
macro.QQV = "Qt QML Viewer" macro.QQV = "Qt QML Viewer"
macro.QS = "Qt Simulator"
macro.QSDK = "Qt SDK" macro.QSDK = "Qt SDK"
macro.qtcversion = $QTC_VERSION macro.qtcversion = $QTC_VERSION
macro.param = "\\e" macro.param = "\\e"

2
doc/src/debugger/creator-debugger.qdoc
View File

@@ -978,7 +978,7 @@
applications on the Mac OS desktop, the release version of Frameworks is used applications on the Mac OS desktop, the release version of Frameworks is used
by default. To step into Frameworks, select the \gui {Use debug versions of by default. To step into Frameworks, select the \gui {Use debug versions of
Frameworks} option in the project run settings for \gui Desktop and Frameworks} option in the project run settings for \gui Desktop and
\gui {Qt Simulator} targets. \gui {\QS} targets.
\section2 Viewing Threads \section2 Viewing Threads

8
doc/src/linux-mobile/creator-madde-emulator.qdoc
View File

@@ -47,12 +47,12 @@
controls, such as the power button, and to the touch screen. controls, such as the power button, and to the touch screen.
To test the application UI, user interaction with the application, and To test the application UI, user interaction with the application, and
functionality that uses the mobility APIs, use the Qt Simulator, functionality that uses the mobility APIs, use \QS,
instead. For more information, see the instead. For more information, see the
\l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator Manual}. \l{http://doc.qt.nokia.com/qtsimulator/index.html}{\QS Manual}.
The difference between Qt Simulator and the emulators is that when you The difference between \QS and the emulators is that when you
compile your application binary for Qt Simulator, it is compiled against a compile your application binary for \QS, it is compiled against a
host library. The binary run on the emulator is compiled for the actual host library. The binary run on the emulator is compiled for the actual
device, using the Maemo 5 or Harmattan tool chain. device, using the Maemo 5 or Harmattan tool chain.

2
doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
View File

@@ -3,7 +3,7 @@
\list 1 \list 1
\o Build and run the application for \l{Running on Qt Simulator} \o Build and run the application for \l{Running on Qt Simulator}
{Qt Simulator}. {\QS}.
\o Build and run the application for a device: \o Build and run the application for a device:

2
doc/src/linux-mobile/creator-projects-running-madde.qdocinc
View File

@@ -3,7 +3,7 @@
\list 1 \list 1
\o Build and run the application for \l{Running on Qt Simulator} \o Build and run the application for \l{Running on Qt Simulator}
{Qt Simulator}. {\QS}.
\o Build and run the application for \o Build and run the application for
\l{Using Maemo or MeeGo Harmattan Emulator} \l{Using Maemo or MeeGo Harmattan Emulator}

2
doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc
View File

@@ -63,7 +63,7 @@
specifies the correct category settings by default when it creates the specifies the correct category settings by default when it creates the
Debian directory and the necessary files. Debian directory and the necessary files.
You can test the application on Qt Simulator and Maemo emulator to make You can test the application on \QS and Maemo emulator to make
sure that it does not crash or hang and to check how it handles different sure that it does not crash or hang and to check how it handles different
memory situations. Before you submit the application to Nokia Publish, you memory situations. Before you submit the application to Nokia Publish, you
must also fully test it on a Maemo device. must also fully test it on a Maemo device.

4
doc/src/overview/creator-target-platforms.qdocinc
View File

@@ -6,7 +6,7 @@
\o Desktop \o Desktop
\o Qt Simulator \o \QS
\o Maemo 5 \o Maemo 5
@@ -27,7 +27,7 @@
\o {6,1} Platform \o {6,1} Platform
\header \header
\o Desktop \o Desktop
\o Qt Simulator \o \QS
\o Maemo 5 \o Maemo 5
\o MeeGo Harmattan \o MeeGo Harmattan
\o Generic Remote Linux \o Generic Remote Linux

10
doc/src/projects/creator-projects-build-run-tutorial.qdoc
View File

@@ -45,7 +45,7 @@
\image qtcreator-gs-build-example-open.png "Selecting an example" \image qtcreator-gs-build-example-open.png "Selecting an example"
\o Select \l{glossary-development-target}{targets} for the project. \o Select \l{glossary-development-target}{targets} for the project.
Select at least Qt Simulator Select at least \QS
and one of the mobile targets, Symbian Device, Maemo 5, or and one of the mobile targets, Symbian Device, Maemo 5, or
MeeGo Harmattan, depending on the device you develop for. MeeGo Harmattan, depending on the device you develop for.
@@ -60,21 +60,21 @@
instructions, select \gui {Previous Page} on the toolbar or instructions, select \gui {Previous Page} on the toolbar or
press \key {Alt+Left}. press \key {Alt+Left}.
\o To test the application in Qt Simulator, click the \gui {Target \o To test the application in \QS, click the \gui {Target
Selector} and select \gui {Qt Simulator}. 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 \o Click
\inlineimage{qtcreator-run.png} \inlineimage{qtcreator-run.png}
to build the application and run it in Qt Simulator. to build the application and run it in \QS.
\o To see the compilation progress, press \key{Alt+4} to open the \o To see the compilation progress, press \key{Alt+4} to open the
\gui {Compile Output} pane. \gui {Compile Output} pane.
The \gui Build progress bar on the toolbar turns green when the The \gui Build progress bar on the toolbar turns green when the
project is successfully built. The application opens in project is successfully built. The application opens in
Qt Simulator. \QS.
\image {qt-simulator.png} "Qt Simulator" \image {qt-simulator.png} "Qt Simulator"

10
doc/src/projects/creator-projects-building-running.qdoc
View File

@@ -83,19 +83,19 @@
\o \l{http://doc.qt.nokia.com/qtsimulator/index.html} \o \l{http://doc.qt.nokia.com/qtsimulator/index.html}
{Using Qt Simulator} {Using Qt Simulator}
You can use the Qt Simulator to test Qt applications that are You can use the \QS to test Qt applications that are
intended for mobile devices in an environment similar to that of intended for mobile devices in an environment similar to that of
the device. You can change the information that the device has the device. You can change the information that the device has
about its configuration and environment. about its configuration and environment.
Qt Simulator does not support any device specific APIs by design. \QS does not support any device specific APIs by design.
Therefore, applications that run well on Qt Simulator also run on Therefore, applications that run well on \QS also run on
any device that hosts the Qt and Qt Mobility libraries. any device that hosts the Qt and Qt Mobility libraries.
The Qt Simulator is installed as part of the \QSDK. After it is The \QS is installed as part of the \QSDK. After it is
installed, you can select it as a build target in \QC. installed, you can select it as a build target in \QC.
\o \l{Using Maemo or MeeGo Harmattan Emulator} \o \l{Using Maemo or MeeGo Harmattan Emulator}
You cannot use Qt Simulator to test applications that use device You cannot use \QS to test applications that use device
specific libraries, such as native device APIs. To test such specific libraries, such as native device APIs. To test such
applications, use the device emulators or real devices. With the applications, use the device emulators or real devices. With the
emulators, you can test how your application reacts to hardware emulators, you can test how your application reacts to hardware

8
doc/src/projects/creator-projects-running-simulator.qdocinc
View File

@@ -1,17 +1,17 @@
\section1 Running on Qt Simulator \section1 Running on Qt Simulator
You can use the Qt Simulator to test Qt applications that are intended You can use the \QS to test Qt applications that are intended
for mobile devices in an environment similar to that of the device. You for mobile devices in an environment similar to that of the device. You
can change the information that the device has about its configuration can change the information that the device has about its configuration
and environment. and environment.
\list 1 \list 1
\o Select \gui {Qt Simulator} as the target. \o Select \gui {\QS} as the target.
\o Click the \gui Run button. \o Click the \gui Run button.
\endlist \endlist
For more information about using the Qt Simulator, see the For more information about using the \QS, see the
\l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator Manual}. \l{http://doc.qt.nokia.com/qtsimulator/index.html}{\QS Manual}.

2
doc/src/projects/creator-projects-running.qdoc
View File

@@ -34,7 +34,7 @@
\title Running on Multiple Targets \title Running on Multiple Targets
By default, running an application also builds it and deploys it to a By default, running an application also builds it and deploys it to a
location from where it can be run on the desktop, in Qt Simulator, or location from where it can be run on the desktop, in \QS, or
on a mobile device that is connected to the development PC. on a mobile device that is connected to the development PC.
To run executable files without deploying them first, deselect the To run executable files without deploying them first, deselect the

2
doc/src/projects/creator-projects-settings-run-analyze.qdocinc
View File

@@ -4,7 +4,7 @@
detecting memory leaks and profiling function execution. You can configure detecting memory leaks and profiling function execution. You can configure
the tools according to your needs. the tools according to your needs.
You can specify analyzer settings for the desktop and Qt Simulator targets. You can specify analyzer settings for the desktop and \QS targets.
You can specify them either globally for all projects or separately for each You can specify them either globally for all projects or separately for each
project. project.

2
doc/src/symbian/creator-projects-running-symbian.qdocinc
View File

@@ -3,7 +3,7 @@
\list 1 \list 1
\o Build and run the application for \l{Running on Qt Simulator} \o Build and run the application for \l{Running on Qt Simulator}
{Qt Simulator}. {\QS}.
\o If no problems are found, build and run the application for a \o If no problems are found, build and run the application for a
device. device.

10
doc/src/symbian/qtquick-components-symbian.qdoc
View File

@@ -61,7 +61,7 @@
\o In the \gui {Application Type} dialog, select \gui {Qt Quick \o In the \gui {Application Type} dialog, select \gui {Qt Quick
Components for Symbian}, and then click \gui{Next}. Components for Symbian}, and then click \gui{Next}.
\o Select \gui {Symbian Device} and \gui {Qt Simulator} targets, and \o Select \gui {Symbian Device} and \gui {\QS} targets, and
then click \gui{Next}. then click \gui{Next}.
\note Targets are listed if you installed the appropriate \note Targets are listed if you installed the appropriate
@@ -160,7 +160,7 @@
horizontally to the text field. horizontally to the text field.
\o To check that the application can be built and run, select \o To check that the application can be built and run, select
\gui {Qt Simulator} as the target and click the \gui {\QS} as the target and click the
\inlineimage qtcreator-run.png \inlineimage qtcreator-run.png
button. button.
@@ -200,12 +200,12 @@
\section1 Compiling and Running Your Program \section1 Compiling and Running Your Program
Now that you have all the necessary code, select \gui {Qt Simulator} Now that you have all the necessary code, select \gui {\QS}
as the target and click the as the target and click the
\inlineimage qtcreator-run.png \inlineimage qtcreator-run.png
button to build your program and run it in the Qt Simulator. button to build your program and run it in \QS.
In Qt Simulator, run the runOutOfBattery.qs example script to see the value In \QS, run the runOutOfBattery.qs example script to see the value
change in the Battery Status application. Select \gui {Scripting > examples change in the Battery Status application. Select \gui {Scripting > examples
> runOutOfBattery.qs > Run Selected Script}. > runOutOfBattery.qs > Run Selected Script}.

2
doc/src/symbian/symbiandev.qdoc
View File

@@ -307,6 +307,6 @@
{Symbian C++ SDKs}. You can use them also for Qt application development. {Symbian C++ SDKs}. You can use them also for Qt application development.
For example, these SDKs provide Symbian device emulators that are built For example, these SDKs provide Symbian device emulators that are built
mostly from the software that the actual devices are running. Therefore, mostly from the software that the actual devices are running. Therefore,
they provide much closer emulation of the device than Qt Simulator. they provide much closer emulation of the device than \QS.
*/ */