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

6 files changed, 48 insertions, 10 deletions

diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 13af50c..05188c7 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,11 @@ 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 is necessary to update Carbide compiler if you are using Carbide 2.0.2 or older. 
+              You can find a compiler patch \l{http://pepper.troll.no/s60prereleases/patches/}{here}.
+           \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/examples/network/ftp/ftp.pro b/examples/network/ftp/ftp.pro
index 0fb9934..634c43c 100644
--- a/examples/network/ftp/ftp.pro
+++ b/examples/network/ftp/ftp.pro
@@ -13,6 +13,7 @@ INSTALLS += target sources
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
 
 symbian {
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
     TARGET.CAPABILITY="NetworkServices"
     TARGET.UID3 = 0xA000A648
     LIBS+=-lesock -lconnmon   # For IAP selection
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index 6a1ffb6..912edb6 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -80,6 +80,21 @@
 
     \note QScopedPointer does not work with arrays.
 
+    \section1 Forward Declared Pointers
+
+    Classes that are forward declared can be used within QScopedPointer, as
+    long as the destructor of the forward declared class is available whenever
+    a QScopedPointer needs to clean up.
+
+    Concretely, this means that all classes containing a QScopedPointer that
+    points to a forward declared class must have non-inline constructors,
+    destructors and assignment operators:
+
+    \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 4
+
+    Otherwise, the compiler output a warning about not being able to destruct
+    \c MyPrivateClass.
+
     \sa QSharedPointer
 */
 
@@ -142,7 +157,7 @@
 
 
 /*!
-    \fn bool QScopedPointer::operator!=(const QScopedPointer<T> *other) const
+    \fn bool QScopedPointer::operator!=(const QScopedPointer<T> &other) const
 
     Inequality operator. Returns true if the scoped pointer \a other
     is not pointing to the same object as this pointer, otherwise returns false.
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 7d79422..9e70cff 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -74,8 +74,6 @@ QCoeFepInputContext::QCoeFepInputContext(QObject *parent)
     m_fepState->SetFlags(EAknEditorFlagDefault);
     m_fepState->SetDefaultInputMode( EAknEditorTextInputMode );
     m_fepState->SetPermittedInputModes( EAknEditorAllInputModes );
-    m_fepState->SetLocalLanguage(ELangEnglish);
-    m_fepState->SetDefaultLanguage(ELangEnglish);
     m_fepState->SetDefaultCase( EAknEditorLowerCase );
     m_fepState->SetPermittedCases( EAknEditorLowerCase|EAknEditorUpperCase );
     m_fepState->SetSpecialCharacterTableResourceId( 0 );
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 0924c57..01a732c 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -50,7 +50,8 @@
 #include <QSharedPointer>
 #include <QHash>
 #endif
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+#if defined(Q_OS_SYMBIAN)
+#if defined(Q_CC_NOKIAX86)
 // In emulator we use WINSOCK connectivity by default. Unfortunately winsock
 // does not work very well with UDP sockets. This defines skips some test
 // cases which have known problems.
@@ -59,6 +60,7 @@
 // network tests. WINPCAP connectivity uses Symbian OS IP stack,
 // correspondingly as HW does. When using WINPCAP disable this define
 //#define SYMBIAN_WINSOCK_CONNECTIVITY
+#endif // Q_CC_NOKIAX86
 
 class QtNetworkSettingsRecord {
 public:
@@ -80,7 +82,7 @@ private:
     QString strRecordValue;
 };
 
-#endif
+#endif // Q_OS_SYMBIAN
 
 class QtNetworkSettings
 {