Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

5 files changed, 68 insertions, 31 deletions

diff --git a/doc/src/development/rcc.qdoc b/doc/src/development/rcc.qdoc
index ff82674..1541e11 100644
--- a/doc/src/development/rcc.qdoc
+++ b/doc/src/development/rcc.qdoc
@@ -57,37 +57,40 @@
     \table
     \header \o Option         \o Argument \o Description
 
-    \row    \o \c{-o}         \o          \o Writes output to file rather than
-                                             stdout.
+    \row \o \c{-o} \o \c{file} \o Write output to \c{file} rather than to stdout.
 
-    \row    \o \c{-name}      \o \c name  \o Creates an external initialization
-                                             function with name.
+    \row \o \c{-name} \o \c{name} \o Create an external initialization 
+    	    	      	 	     function with \c{name}.
 
-    \row    \o \c{-threshold} \o \c level \o Specifies a threshold (in bytes)
-                                             to use when compressing files. If
-                                             the file is smaller than the
-                                             threshold, it will not be
-                                             compressed, independent of what
-                                             the compression level is.
+    \row \o \c{-threshold} \o \c{level} \o Specifies a threshold \c{level} (in 
+    	    		      		   bytes) to use when deciding whether
+					   to compress a file. If the file is 
+					   smaller than the threshold \c{level}, 
+					   it is not compressed. The default
+					   threshold level is 70 bytes.
                                              
-    \row    \o \c{-compress}  \o \c level \o Compresses input files with the
-                                             given level. Level is an integer
-                                             from 1 to 9 - 1 being the fastest,
-                                             producing the least compression;
-                                             9 being the slowest, producing
-                                             the most compression.
+    \row \o \c{-compress} \o \c{level} \o Compress input files to the given
+                                          compression \c{level}, which is an 
+					  integer in the range 1 to 9. Level 1 
+					  does the least compression but is 
+					  fastest. Level 9 does the most 
+					  compression but is slowest. To turn 
+					  off compression, use \c{-no-compress}. 
+					  The default value for \c{level} is -1,
+					  which means use zlib's default 
+					  compression level. 
 
-    \row    \o \c{-root}      \o \c path  \o Prefixes the resource access path
-                                             with root path.
+    \row \o \c{-root} \o \c{path} \o Prefix the resource access path with \c{path}.
+    	    	      	 	     The default is no prefix.
 
-    \row    \o \c{-no-compress} \o        \o Disables all compression.
+    \row \o \c{-no-compress} \o \o Disable compression.
 
-    \row    \o \c{-binary}    \o          \o Outputs a binary file for use as
-                                             a dynamic resource.
+    \row \o \c{-binary} \o \o Output a binary file for use as a dynamic resource.
 
-    \row    \o \c{-version}   \o          \o Displays version information.
+    \row \o \c{-version} \o \o Display version information.
+
+    \row \o \c{-help} \o \o Display usage information.
 
-    \row    \o \c{-help}      \o          \o Displays usage information.
     \endtable
 
     See also \l{The Qt Resource System} for more information about embedding
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 116f8df..427f45a 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
 */
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 019f208..f000075 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -89,9 +89,9 @@ private:
     {
 //![1]
         QAudioFormat format;
-        format.setFrequency(44100);
+        format.setSampleRate(44100);
 //![1]
-        format.setChannels(2);
+        format.setChannelCount(2);
         format.setSampleSize(16);
         format.setCodec("audio/pcm");
         format.setByteOrder(QAudioFormat::LittleEndian);
diff --git a/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp b/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
index 99fd0cf..bcb61f7 100644
--- a/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
+++ b/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
@@ -62,6 +62,7 @@ while (new_data_available()) {
     QByteArray chunk = get_new_data();
     string += decoder->toUnicode(chunk);
 }
+delete decoder;
 //! [2]
 
 
diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index 736394f..3cd3db8 100644
--- a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -401,5 +401,22 @@ QByteArray text = QByteArray::fromHex("517420697320677265617421");
 text.data();            // returns "Qt is great!"
 //! [45]
 
+//! [46]
+QString tmp = "test";
+QByteArray text = tmp.toLocal8Bit();
+char *data = new char[text.size()]
+strcpy(data, text.data());
+delete [] data; 
+//! [46]
+
+//! [47]
+QString tmp = "test";
+QByteArray text = tmp.toLocal8Bit();
+char *data = new char[text.size() + 1]
+strcpy(data, text.data());
+delete [] data;
+//! [47]
+
 }
 
+