Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public

3 files changed, 32 insertions, 5 deletions

diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 13af50c..c8310ff 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -554,9 +554,9 @@ in the \l{Qt for S60 Requirements} document.
 \note Qt for S60 has some requirements that are given in more detail
 in the \l{Qt for S60 Requirements} document.
 
-\note This document describes how to install Qt for S60 from the source package. 
-Go \l{Installing Qt on S60 using binary package}{here} for instructions on how to install 
-Qt using binary package.
+\note \bold {This document describes how to install and configure Qt for S60 from scratch. 
+If you are using pre-built binaries, follow the instructions
+\l{Installing Qt on S60 using binary package}{here}.}
 
 \list 1
 
@@ -904,7 +904,12 @@ Qt using binary package.
 
     Qt for S60 requires the following software installed on your development PC:
     \list
-        \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}
+        \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}           
+           \list
+           \o \bold{Note:} It may be necessary to update the Carbide compiler.
+              See \l{http://pepper.troll.no/s60prereleases/patches/}{here} for instructions how to check your
+              compiler version and how to patch it, if needed.
+           \endlist
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher}
         \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}. 
            Install this to all S60 SDKs you plan to use Qt with.
diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
index 05377dd..7de42b7 100644
--- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
@@ -3,7 +3,6 @@ void myFunction(bool useSubClass)
 {
     MyClass *p = useSubClass ? new MyClass() : new MySubClass;
     QIODevice *device = handsOverOwnership();
-    QIODevi
 
     if (m_value > 3) {
         delete p;
@@ -62,3 +61,22 @@ if (scopedPointer) {
     ...
 }
 //! [3]
+
+//! [4]
+class MyPrivateClass; // forward declare MyPrivateClass
+
+class MyClass
+{
+private:
+    QScopedPointer<MyPrivateClass> privatePtr; // QScopedPointer to forward declared class
+
+public:
+    MyClass(); // OK
+    inline ~MyClass() {} // VIOLATION - Destructor must not be inline
+
+private:
+    Q_DISABLE_COPY(MyClass) // OK - copy constructor and assignment operators
+                             // are now disabled, so the compiler won't implicitely
+                             // generate them.
+};
+//! [4]
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc
index 09a86bd..7a351f9 100644
--- a/doc/src/topics.qdoc
+++ b/doc/src/topics.qdoc
@@ -305,8 +305,12 @@ including ARM, Intel x86, MIPS and SH-4.
 \group qts60
 \title Qt for S60
 \ingroup topics
+\ingroup qt-embedded
 \brief Documents related to Qt for S60
 
+Qt for S60 is a C++ framework for GUI and application development
+for embedded devices running Symbian.
+
 \list
     \o \l {Exception Safety with Symbian}
 \endlist