diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 7969cca424b..4773a97130d 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -21,6 +21,7 @@ macro.QD = "Qt Designer" macro.QL = "Qt Linguist" macro.QMLD = "Qt Quick Designer" macro.QQV = "Qt QML Viewer" +macro.QS = "Qt Simulator" macro.QSDK = "Qt SDK" macro.qtcversion = $QTC_VERSION macro.param = "\\e" diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 4e1cc0f082a..0c5a7b6328d 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -978,7 +978,7 @@ 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 Frameworks} option in the project run settings for \gui Desktop and - \gui {Qt Simulator} targets. + \gui {\QS} targets. \section2 Viewing Threads diff --git a/doc/src/linux-mobile/creator-madde-emulator.qdoc b/doc/src/linux-mobile/creator-madde-emulator.qdoc index 9f264fb4252..8037183536d 100644 --- a/doc/src/linux-mobile/creator-madde-emulator.qdoc +++ b/doc/src/linux-mobile/creator-madde-emulator.qdoc @@ -47,12 +47,12 @@ controls, such as the power button, and to the touch screen. 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 - \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 - compile your application binary for Qt Simulator, it is compiled against a + The difference between \QS and the emulators is that when you + compile your application binary for \QS, it is compiled against a host library. The binary run on the emulator is compiled for the actual device, using the Maemo 5 or Harmattan tool chain. diff --git a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc index 3d5ff214a77..64b7f0b7043 100644 --- a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc +++ b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc @@ -3,7 +3,7 @@ \list 1 \o Build and run the application for \l{Running on Qt Simulator} - {Qt Simulator}. + {\QS}. \o Build and run the application for a device: diff --git a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc index c4d264abaf6..bd648892ce1 100644 --- a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc +++ b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc @@ -3,7 +3,7 @@ \list 1 \o Build and run the application for \l{Running on Qt Simulator} - {Qt Simulator}. + {\QS}. \o Build and run the application for \l{Using Maemo or MeeGo Harmattan Emulator} diff --git a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc index bca06f5fa15..f1e6f698c7c 100644 --- a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc +++ b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc @@ -63,7 +63,7 @@ specifies the correct category settings by default when it creates the 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 memory situations. Before you submit the application to Nokia Publish, you must also fully test it on a Maemo device. diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc index a6af0d786d8..7a0a7533a56 100644 --- a/doc/src/overview/creator-target-platforms.qdocinc +++ b/doc/src/overview/creator-target-platforms.qdocinc @@ -6,7 +6,7 @@ \o Desktop - \o Qt Simulator + \o \QS \o Maemo 5 @@ -27,7 +27,7 @@ \o {6,1} Platform \header \o Desktop - \o Qt Simulator + \o \QS \o Maemo 5 \o MeeGo Harmattan \o Generic Remote Linux diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc index ceee255b76a..885f3d3a49a 100644 --- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc +++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc @@ -45,7 +45,7 @@ \image qtcreator-gs-build-example-open.png "Selecting an example" \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 MeeGo Harmattan, depending on the device you develop for. @@ -60,21 +60,21 @@ 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}. + \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" \o Click \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 \gui {Compile Output} pane. The \gui Build progress bar on the toolbar turns green when the project is successfully built. The application opens in - Qt Simulator. + \QS. \image {qt-simulator.png} "Qt Simulator" diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc index 6837666097f..9e6d1194c0d 100644 --- a/doc/src/projects/creator-projects-building-running.qdoc +++ b/doc/src/projects/creator-projects-building-running.qdoc @@ -83,19 +83,19 @@ \o \l{http://doc.qt.nokia.com/qtsimulator/index.html} {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 the device. You can change the information that the device has about its configuration and environment. - Qt Simulator does not support any device specific APIs by design. - Therefore, applications that run well on Qt Simulator also run on + \QS does not support any device specific APIs by design. + Therefore, applications that run well on \QS also run on 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. \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 applications, use the device emulators or real devices. With the emulators, you can test how your application reacts to hardware diff --git a/doc/src/projects/creator-projects-running-simulator.qdocinc b/doc/src/projects/creator-projects-running-simulator.qdocinc index e794bf2d930..1b802dbc56b 100644 --- a/doc/src/projects/creator-projects-running-simulator.qdocinc +++ b/doc/src/projects/creator-projects-running-simulator.qdocinc @@ -1,17 +1,17 @@ \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 can change the information that the device has about its configuration and environment. \list 1 - \o Select \gui {Qt Simulator} as the target. + \o Select \gui {\QS} as the target. \o Click the \gui Run button. \endlist - For more information about using the Qt Simulator, see the - \l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator Manual}. + For more information about using the \QS, see the + \l{http://doc.qt.nokia.com/qtsimulator/index.html}{\QS Manual}. diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 02bf42abc1a..24cb50da38a 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -34,7 +34,7 @@ \title Running on Multiple Targets 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. To run executable files without deploying them first, deselect the diff --git a/doc/src/projects/creator-projects-settings-run-analyze.qdocinc b/doc/src/projects/creator-projects-settings-run-analyze.qdocinc index 432baf0ae4e..69352b1dcf4 100644 --- a/doc/src/projects/creator-projects-settings-run-analyze.qdocinc +++ b/doc/src/projects/creator-projects-settings-run-analyze.qdocinc @@ -4,7 +4,7 @@ detecting memory leaks and profiling function execution. You can configure 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 project. diff --git a/doc/src/symbian/creator-projects-running-symbian.qdocinc b/doc/src/symbian/creator-projects-running-symbian.qdocinc index 1988e03b1f6..4765866e424 100644 --- a/doc/src/symbian/creator-projects-running-symbian.qdocinc +++ b/doc/src/symbian/creator-projects-running-symbian.qdocinc @@ -3,7 +3,7 @@ \list 1 \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 device. diff --git a/doc/src/symbian/qtquick-components-symbian.qdoc b/doc/src/symbian/qtquick-components-symbian.qdoc index 70e422fd782..e5eaf58f701 100644 --- a/doc/src/symbian/qtquick-components-symbian.qdoc +++ b/doc/src/symbian/qtquick-components-symbian.qdoc @@ -61,7 +61,7 @@ \o In the \gui {Application Type} dialog, select \gui {Qt Quick 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}. \note Targets are listed if you installed the appropriate @@ -160,7 +160,7 @@ horizontally to the text field. \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 button. @@ -200,12 +200,12 @@ \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 \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 > runOutOfBattery.qs > Run Selected Script}. diff --git a/doc/src/symbian/symbiandev.qdoc b/doc/src/symbian/symbiandev.qdoc index 893f537876d..d4c0f67ea6c 100644 --- a/doc/src/symbian/symbiandev.qdoc +++ b/doc/src/symbian/symbiandev.qdoc @@ -307,6 +307,6 @@ {Symbian C++ SDKs}. You can use them also for Qt application development. For example, these SDKs provide Symbian device emulators that are built 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. */