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 40773e06027fff44be06cfb4e0d2a8f1d74064e7..e0f83984595557c85e5541f99f206901e19f9445 100644
--- a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
@@ -2,9 +2,6 @@
\list 1
- \li Build and run the application for \l{Running on Qt Simulator}
- {\QS}.
-
\li Build and run the application for a device:
\list 1
diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc
index 62906e3ea3d1013931afbc07b0cdcc5e7a9849b9..8adcb6d1181190b4dd2544fd472427a38c6ffcaa 100644
--- a/doc/src/overview/creator-target-platforms.qdocinc
+++ b/doc/src/overview/creator-target-platforms.qdocinc
@@ -16,8 +16,6 @@
\li QNX
- \li \QS
-
\endlist
The following table summarizes operating system support for developing
@@ -57,11 +55,6 @@
\li Yes
\li Yes
\li Yes (see \l{Running on QNX Devices} for limitations)
- \row
- \li \QS
- \li Yes
- \li Yes
- \li Yes
\endtable
\note Symbian support has been removed from \QC 2.6. To develop for Symbian,
diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc
index 97411f2df822d22adf3e0b3cab80136e686395a1..ffb704d3058e6aa332ec3e8a6b1889211eac8355 100644
--- a/doc/src/projects/creator-projects-building-running.qdoc
+++ b/doc/src/projects/creator-projects-building-running.qdoc
@@ -82,21 +82,6 @@
a location from where it can be run on the device. You can change
the relationship between the build, run, and deploy configurations.
- \li \l{http://doc.qt.digia.com/qtsimulator/index.html}
- {Using Qt Simulator}
-
- 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.
- \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 \QS is installed as part of the Qt 4 SDK. After it is
- installed, you can create a \l{glossary-buildandrun-kit}{kit}
- with \gui Desktop device type and the Qt Simulator Qt version for
- building and running your projects.
-
\endlist
*/
diff --git a/doc/src/projects/creator-projects-running-simulator.qdocinc b/doc/src/projects/creator-projects-running-simulator.qdocinc
deleted file mode 100644
index f343b521b88f6b26922031e6e9e8d1dae6830639..0000000000000000000000000000000000000000
--- a/doc/src/projects/creator-projects-running-simulator.qdocinc
+++ /dev/null
@@ -1,17 +0,0 @@
- \section1 Running on Qt Simulator
-
- 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
-
- \li Select \gui {\QS} as the build and run \l{glossary-buildandrun-kit}{kit}.
-
- \li Click the \gui Run button.
-
- \endlist
-
- For more information about using the \QS, see the
- \l{http://doc.qt.digia.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 3d98ba56881d34e483df5d028afd7f75c3c43a80..92cac2b55e5573cac3a0604cbc790bbbd0b7f785 100644
--- a/doc/src/projects/creator-projects-running.qdoc
+++ b/doc/src/projects/creator-projects-running.qdoc
@@ -31,8 +31,8 @@
\title Running on Multiple Platforms
By default, running an application also builds it and deploys it to a
- location from where it can be run on the desktop, in \QS, or
- on a mobile device that is connected to the development PC.
+ location from where it can be run on the desktop, on a device emulator or
+ simulator, or on a mobile device that is connected to the development PC.
To run executable files without deploying them first, deselect the
\gui {Tools > Options > Project > Always deploy project before running it}
@@ -42,7 +42,6 @@
\l{Specifying Run Settings}.
\include projects/creator-projects-running-desktop.qdocinc
- \include projects/creator-projects-running-simulator.qdocinc
\include linux-mobile/creator-projects-running-generic-linux.qdocinc
\include qnx/creator-projects-running-qnx.qdocinc
*/