Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 files changed, 61 insertions, 47 deletions

diff --git a/doc/src/demos/mediaplayer.qdoc b/doc/src/demos/mediaplayer.qdoc
index 9e6b3f9..17ae79b 100644
--- a/doc/src/demos/mediaplayer.qdoc
+++ b/doc/src/demos/mediaplayer.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/mediaplayer
+    \example demos/qmediaplayer
     \title Media Player
 
     The Media Player demonstration shows how \l{Phonon Module}{Phonon}
diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc
index ec8584c..8fded88 100644
--- a/doc/src/examples/ftp.qdoc
+++ b/doc/src/examples/ftp.qdoc
@@ -78,13 +78,13 @@
     \l{QFtp::Command}{commands} we request are finished, the progress
     of current commands, and information about files on the server.
 
-    \snippet examples/network/ftp/ftpwindow.h 0
+    \snippet examples/network/qftp/ftpwindow.h 0
 
     We will look at each slot when we examine the \c FtpWindow
     implementation in the next section. We also make use of a few
     private variables:
 
-    \snippet examples/network/ftp/ftpwindow.h 1
+    \snippet examples/network/qftp/ftpwindow.h 1
 
     The \c isDirectory hash keeps a history of all entries explored on
     the FTP server, and registers whether an entry represents a
@@ -98,7 +98,7 @@
     
     We move on to the slots, starting with \c connectOrDisconnect().
 
-    \snippet examples/network/ftp/ftpwindow.cpp 0
+    \snippet examples/network/qftp/ftpwindow.cpp 0
 
     If \c ftp is already pointing to a QFtp object, we QFtp::Close its
     FTP connection and delete the object it points to. Note that we do
@@ -106,7 +106,7 @@
     to finish its abort operation.
 
     \dots
-    \snippet examples/network/ftp/ftpwindow.cpp 1
+    \snippet examples/network/qftp/ftpwindow.cpp 1
 
     If we get here, \c connectOrDisconnect() was called to establish a
     new FTP connection. We create a new QFtp for our new connection,
@@ -118,7 +118,7 @@
     is emitted repeatedly during an FTP file transfer, giving us
     progress reports.
 
-    \snippet examples/network/ftp/ftpwindow.cpp 2
+    \snippet examples/network/qftp/ftpwindow.cpp 2
 
     The \gui {Ftp Server} line edit contains the IP address or
     hostname of the server to which we want to connect. We first check
@@ -134,39 +134,39 @@
 
     We move on to the \c downloadFile() slot:
 
-    \snippet examples/network/ftp/ftpwindow.cpp 3
+    \snippet examples/network/qftp/ftpwindow.cpp 3
     \dots
-    \snippet examples/network/ftp/ftpwindow.cpp 4
+    \snippet examples/network/qftp/ftpwindow.cpp 4
     
     We first fetch the name of the file, which we find in the selected
     item of \c fileList. We then start the download by using
     QFtp::get(). QFtp will send progress signals during the download
     and a signal when the download is completed.  
 
-    \snippet examples/network/ftp/ftpwindow.cpp 5
+    \snippet examples/network/qftp/ftpwindow.cpp 5
 
     QFtp supports canceling the download of files.
 
-    \snippet examples/network/ftp/ftpwindow.cpp 6
+    \snippet examples/network/qftp/ftpwindow.cpp 6
 
     The \c ftpCommandFinished() slot is called when QFtp has
     finished a QFtp::Command. If an error occurred during the
     command, QFtp will set \c error to one of the values in
     the QFtp::Error enum; otherwise, \c error is zero.
     
-    \snippet examples/network/ftp/ftpwindow.cpp 7
+    \snippet examples/network/qftp/ftpwindow.cpp 7
 
     After login, the QFtp::list() function will list the top-level
     directory on the server. addToList() is connected to
     QFtp::listInfo(), and will be invoked for each entry in that
     directory.
 
-    \snippet examples/network/ftp/ftpwindow.cpp 8
+    \snippet examples/network/qftp/ftpwindow.cpp 8
 
     When a \l{QFtp::}{Get} command is finished, a file has finished
     downloading (or an error occurred during the download).
     
-    \snippet examples/network/ftp/ftpwindow.cpp 9
+    \snippet examples/network/qftp/ftpwindow.cpp 9
 
     After a \l{QFtp::}{List} command is performed, we have to check if
     no entries were found (in which case our \c addToList() function
@@ -174,7 +174,7 @@
 
     Let's continue with the \c addToList() slot:
 
-    \snippet examples/network/ftp/ftpwindow.cpp 10
+    \snippet examples/network/qftp/ftpwindow.cpp 10
 
     When a new file has been resolved during a QFtp::List command,
     this slot is invoked with a QUrlInfo describing the file. We
@@ -182,26 +182,26 @@
     does not have a current item, we set the new item to be the
     current item.
 
-    \snippet examples/network/ftp/ftpwindow.cpp 11
+    \snippet examples/network/qftp/ftpwindow.cpp 11
 
     The \c processItem() slot is called when an item is double clicked
     in the \gui {File List}. If the item represents a directory, we
     want to load the contents of that directory with QFtp::list().
 
-    \snippet examples/network/ftp/ftpwindow.cpp 12
+    \snippet examples/network/qftp/ftpwindow.cpp 12
 
     \c cdToParent() is invoked when the user requests to go to the
     parent directory of the one displayed in the file list. After
     changing the directory, we QFtp::List its contents.
 
-    \snippet examples/network/ftp/ftpwindow.cpp 13
+    \snippet examples/network/qftp/ftpwindow.cpp 13
 
     The \c updateDataTransferProgress() slot is called regularly by
     QFtp::dataTransferProgress() when a file download is in progress.
     We use a QProgressDialog to show the download progression to the
     user.
 
-    \snippet examples/network/ftp/ftpwindow.cpp 14
+    \snippet examples/network/qftp/ftpwindow.cpp 14
 
     The \c enableDownloadButton() is called whenever the current item
     in \c fileList changes. If the item represents a file, the \gui
diff --git a/doc/src/examples/musicplayerexample.qdoc b/doc/src/examples/musicplayerexample.qdoc
index 41c9f3a..7145583 100644
--- a/doc/src/examples/musicplayerexample.qdoc
+++ b/doc/src/examples/musicplayerexample.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example phonon/musicplayer
+    \example phonon/qmusicplayer
     \title Music Player Example
 
     The Music Player Example shows how to use Phonon - the multimedia
@@ -90,7 +90,7 @@
     look at them when we walk through the \c MainWindow
     implementation.
 
-    \snippet examples/phonon/musicplayer/mainwindow.h 2
+    \snippet examples/phonon/qmusicplayer/mainwindow.h 2
 
     We use the \l{Phonon::}{SeekSlider} to move the current playback
     position in the media stream, and the \l{Phonon::}{VolumeSlider}
@@ -99,7 +99,7 @@
     metaInformationProvider, to get the meta information from the
     music files. More on this later.
 
-    \snippet examples/phonon/musicplayer/mainwindow.h 1
+    \snippet examples/phonon/qmusicplayer/mainwindow.h 1
 
     The \l{Phonon::}{MediaObject} informs us of the state of the playback and
     properties of the media it is playing back through a series of
@@ -116,7 +116,7 @@
 
     We start with the constructor:
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 0
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 0
 
     We start by instantiating our media and audio output objects.
     As mentioned, the media object knows how to playback
@@ -130,20 +130,20 @@
     paths. Objects are connected using the \c createPath() function,
     which is part of the Phonon namespace.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 1
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 1
 
     We also connect signals of the media object to slots in our \c
     MainWindow. We will examine them shortly.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 2
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 2
 
     Finally, we call private helper functions to set up the GUI.
     The \c setupUi() function contains code for setting up the seek
     , and volume slider. We move on to \c setupUi():
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 3
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 3
     \dots
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 4
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 4
 
     After creating the widgets, they must be supplied with the
     \l{Phonon::}{MediaObject} and \l{Phonon::}{AudioOutput} objects
@@ -152,12 +152,12 @@
     In the \c setupActions(), we connect the actions for the play,
     pause, and stop tool buttons, to slots of the media object.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 5
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 5
 
     We move on to the slots of \c MainWindow, starting with \c
     addFiles(): 
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 6
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 6
 
     In the \c addFiles() slot, we add files selected by the user to
     the \c sources list. We then set the first source selected on the
@@ -169,7 +169,7 @@
     stateChanged() signal. The \c stateChanged() slot is connected
     to this signal.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 9
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 9
 
     The \l{Phonon::MediaObject::}{errorString()} function gives a
     description of the error that is suitable for users of a Phonon
@@ -177,7 +177,7 @@
     helps us determine whether it is possible to try to play the same
     file again.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 10
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 10
 
     We update the GUI when the playback state changes, i.e., when it
     starts, pauses, stops, or resumes.
@@ -188,26 +188,26 @@
     The \c tick() slot is connected to a \l{Phonon::}{MediaObject} signal which is
     emitted when the playback position changes:
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 11
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 11
 
     The \c time is given in milliseconds.
 
     When the table is clicked on with the mouse, \c tableClick()
     is invoked:
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 12
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 12
 
     Since we stop the media object, we first check whether it is
     currently playing. \c row contains the row in the table that was
     clicked upon; the indices of \c sources follows the table, so we
     can simply use \c row to find the new source.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 13
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 13
 
     When the media source changes, we simply need to select the
     corresponding row in the table.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 14
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 14
 
     When \c metaStateChanged() is invoked, \c
     metaInformationProvider has resolved the meta data for its current
@@ -220,7 +220,7 @@
     music table. A file might not contain the meta data requested,
     in which case an empty string is returned.
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 15
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 15
 
     If we have media sources in \c sources of which meta information
     is not resolved, we set a new source on the \c
@@ -229,7 +229,7 @@
 
     We move on to the \c aboutToFinish() slot:
 
-    \snippet examples/phonon/musicplayer/mainwindow.cpp 16
+    \snippet examples/phonon/qmusicplayer/mainwindow.cpp 16
 
     When a file is finished playing, the Music Player will move on and
     play the next file in the table. This slot is connected to the
@@ -244,5 +244,5 @@
     \l{QCoreApplication::}{setApplicationName()}. This is because
     D-Bus, which is used by Phonon on Linux systems, demands this.
 
-    \snippet examples/phonon/musicplayer/main.cpp 1
+    \snippet examples/phonon/qmusicplayer/main.cpp 1
 */
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 532715e..8f2829a 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -157,7 +157,7 @@
     \section1 Phonon
 
     \list
-    \o \l{demos/mediaplayer}{Media Player} demonstrates how the \l{Phonon Module} can be
+    \o \l{demos/qmediaplayer}{Media Player} demonstrates how the \l{Phonon Module} can be
     used to implement a basic media player application.
     \endlist
 
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 30dae88..2ad730a7 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -827,7 +827,7 @@
 
     \list
     \o \l{phonon/capabilities}{Capabilities}\raisedaster
-    \o \l{phonon/musicplayer}{Music Player}\raisedaster
+    \o \l{phonon/qmusicplayer}{Music Player}\raisedaster
     \endlist
 */
 
diff --git a/doc/src/howtos/exceptionsafety.qdoc b/doc/src/howtos/exceptionsafety.qdoc
index 23bedf5..fa1427b 100644
--- a/doc/src/howtos/exceptionsafety.qdoc
+++ b/doc/src/howtos/exceptionsafety.qdoc
@@ -144,12 +144,12 @@
 
     \section1 Platform-Specific Exception Handling
 
-    \section2 Symbian (Qt for S60)
+    \section2 The Symbian platform
 
     The Symbian platform implements its own exception system that differs from the standard
-    C++ mechanism. When using Qt for S60, and especially when writing code to access Symbian
-    functionality directly, it may be necessary to know about the underlying implementation
-    and how it interacts with Qt.
+    C++ mechanism. When using Qt for Symbian platform, and especially when writing code to 
+    access Symbian functionality directly, it may be necessary to know about the underlying 
+    implementation and how it interacts with Qt.
 
     The \l{Exception Safety with Symbian} document shows how to use the facilities provided
     by Qt to use exceptions as safely as possible.
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
index 5b5240a..4577bf0 100644
--- a/doc/src/platforms/compiler-notes.qdoc
+++ b/doc/src/platforms/compiler-notes.qdoc
@@ -204,10 +204,22 @@
 
     \section2 Sun Studio
 
-    Qt is tested using Sun Studio 8 (Sun CC 5.5). Go to
+    Qt is tested using Sun Studio 12 (Sun CC 5.9). Go to
     \l{Sun Studio Patches} page on Sun's Web site to download
     the latest patches for your Sun compiler.
 
+    Please note that Qt 4.6 is stricter in its STL requirements and
+    that the default STL implementation used by Sun CC does not pass
+    those requirements. This does not affect binary compatibility and
+    you can continue to use STL in your own code, but Qt's
+    STL-compatibility functions will be disabled.
+
+    Sun CC ships with a secondary STL implementation (called stlport4)
+    which is standards-compliant and can be used by Qt. You can enable
+    it by passing the -library=stlport4 option to the compiler. Note
+    that this does not affect Qt's binary compatibility, but it may
+    affect that of other libraries and programs that use STL.
+
     \section2 Sun WorkShop 5.0
 
     Sun WorkShop 5.0 is not supported with Qt 4.
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 5be66f8..9896b08 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -67,6 +67,8 @@
     \tableofcontents{1 Platform Notes - Windows}
     \o \l{Platform Notes - Mac OS X}
     \tableofcontents{1 Platform Notes - Mac OS X}
+    \o \l{Platform Notes - Symbian}
+    \tableofcontents{1 Platform Notes - Symbian}
     \o \l{Platform Notes - Embedded Linux}
     \tableofcontents{1 Platform Notes - Embedded Linux}
     \o \l{Platform Notes - Windows CE}
@@ -409,7 +411,7 @@
     to run on. More information about the combinations of platforms and compilers
     supported by Qt can be found on the \l{Supported Platforms} page.
 
-    For information about mixing exceptions with symbian leaves,
+    For information about mixing exceptions with Symbian leaves,
     see \l{Exception Safety with Symbian}
 
     \section1 Multimedia and Phonon Support
diff --git a/doc/src/platforms/s60-introduction.qdoc b/doc/src/platforms/s60-introduction.qdoc
index d145a82..d27eb39 100644
--- a/doc/src/platforms/s60-introduction.qdoc
+++ b/doc/src/platforms/s60-introduction.qdoc
@@ -122,8 +122,8 @@ build targets, as shown in the table below:
     \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. 
                                        -i, install the package right away using PC suite.
                                        -c=<file>, read certificate information from a file.
-                                       Execute \c{perl createpackage.pl} for more information
-                                       about options.
+                                       Execute \c{createpackage.pl} script without any
+                                       parameters for more information about options.
                                        By default no otions are given.
     \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in