Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Enable building with MSVC2008
  Added mention of Symbian binary packages to INSTALL file
  Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on
  Deploy sqlite3.sis instead of sqlite3.dll in Symbian
  Separated "make run" and "make runonphone" targets
  Added UIDs and icons to some webkit examples
  Implemented node disconnection in Phonon MMF backend
  Removed dead code from Phonon MMF backend
  Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.
  Implemented support for playlist handling in Phonon MMF backend
  Mediaplayer: enqueue all entries from .ram file before starting playback
  Changed call sequence of seeking in Phonon MMF backend, for streaming
  Implemented buffer status notifications in Phonon MMF backend
  Added support for streaming playback to Phonon MMF backend
  Phonon MMF: leaves during object construction throw exceptions
  Removed stale TODO comments from Phonon MMF backend
  Symbian: More i18n strings work.
  Fixed bug which caused Phonon backend error messages to be suppressed
  Added error strings to Phonon MMF backend

1 files changed, 22 insertions, 6 deletions

diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 477e629..4d06bbc 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -124,12 +124,8 @@
     \row \o \c release-gcce  \o Build release binaries for hardware using GCCE.
     \row \o \c debug-armv5   \o Build debug binaries for hardware using RVCT.
     \row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
-    \row \o \c run           \o Run the application. Environment variable
-                                \c QT_SIS_TARGET (see below) can be used to specify which
-                                build target is run. By default it is the last build target.
-                                Note that running the application on real device
-                                using this command requires \c TRK application to be running
-                                on the device.
+    \row \o \c run           \o Run the application on the emulator.
+    \row \o \c runonphone    \o Run the application on a device.
     \row \o \c sis           \o Create signed \c .sis file for project.
     \endtable
 
@@ -199,4 +195,24 @@
     with the \c QT_SIS_OPTIONS=-i, like this:
 
     \snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 5
+
+    \section1 Running applications from command line
+
+    The application can be launched on the emulator using \c{make run} command.
+
+    The application can be launched on a device using \c{make runonphone} command.
+    When this command is invoked, a \c .sis file is first created as if \c{make sis}
+    command was invoked (see above for details).
+    \bold{Note:} Running the application on a device using this command requires
+    \c TRK application to be running on the device.
+
+    Additional environment variables that can be utilized with these commands are:
+    \table
+    \row \o \c QT_RUN_OPTIONS           \o Any command line parameters you wish to pass
+                                           to your application.
+    \row \o \c QT_RUN_ON_PHONE_OPTIONS  \o Options for runonphone application.
+                                           Execute \c runonphone from command line for
+                                           more information about available options.
+                                           \c{make runonphone} only.
+    \endtable
 */