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

24 files changed, 57 insertions, 19 deletions

diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index b543fa2..92d9123 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <demolauncher>
   <demos>
-    <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/>
-    <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
+    <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer_s60.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/>
+    <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo_s60.png"/>
     <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
     <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
-    <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly.png" args="-small-screen"/>
-    <example filename="ftp" name="Ftp Client" image="screenshots/ftp.png"/>
-    <example filename="context2d" name="Context2d" image="screenshots/context2d.png"/>
-    <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks.png"/>
-    <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices.png"/>
-    <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets.png" args="-small-screen"/>
-    <example filename="drilldown" name="Drilldown" image="screenshots/drilldown.png"/>
-    <example filename="softkeys" name="Softkeys" image="screenshots/softkeys.png"/>
+    <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/>
+    <example filename="ftp" name="Ftp Client" image="screenshots/ftp_s60.png"/>
+    <example filename="context2d" name="Context2d" image="screenshots/context2d_s60.png"/>
+    <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/>
+    <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices_s60.png"/>
+    <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets_s60.png" args="-small-screen"/>
+    <example filename="drilldown" name="Drilldown" image="screenshots/drilldown_s60.png"/>
+    <example filename="softkeys" name="Softkeys" image="screenshots/softkeys_s60.png"/>
   </demos>
   <slideshow timeout="60000" interval="10000">
     <imagedir dir="slides"/>
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d.png b/demos/embedded/fluidlauncher/screenshots/context2d.png
deleted file mode 100644
index d571546..0000000
--- a/demos/embedded/fluidlauncher/screenshots/context2d.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
new file mode 100644
index 0000000..a53f5b0
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices.png b/demos/embedded/fluidlauncher/screenshots/desktopservices.png
deleted file mode 100644
index a8d82ce..0000000
--- a/demos/embedded/fluidlauncher/screenshots/desktopservices.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
new file mode 100644
index 0000000..f4aa1a2
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown.png b/demos/embedded/fluidlauncher/screenshots/drilldown.png
deleted file mode 100644
index 413d713..0000000
--- a/demos/embedded/fluidlauncher/screenshots/drilldown.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
new file mode 100644
index 0000000..50376c1
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
new file mode 100644
index 0000000..11459dc
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png
deleted file mode 100644
index 87b9099..0000000
--- a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
new file mode 100644
index 0000000..56da9dc
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp.png b/demos/embedded/fluidlauncher/screenshots/ftp.png
deleted file mode 100644
index fae7ffc..0000000
--- a/demos/embedded/fluidlauncher/screenshots/ftp.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
new file mode 100644
index 0000000..ea6a321
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png
deleted file mode 100644
index 6a2b07f..0000000
--- a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
new file mode 100644
index 0000000..c451198
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys.png b/demos/embedded/fluidlauncher/screenshots/softkeys.png
deleted file mode 100644
index 99681b9..0000000
--- a/demos/embedded/fluidlauncher/screenshots/softkeys.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png
new file mode 100644
index 0000000..03989fb
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
new file mode 100644
index 0000000..bad9692
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
new file mode 100644
index 0000000..690ab48
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
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/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp
index 9672aee..e717510 100644
--- a/examples/widgets/softkeys/softkeys.cpp
+++ b/examples/widgets/softkeys/softkeys.cpp
@@ -127,7 +127,9 @@ void MainWindow::addSoftKeys()
     QList<QAction*> softkeys;
     softkeys.append(ok);
     softkeys.append(cancel);
-    pushButton->setSoftKeys(softkeys);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKeys(softkeys);
 }
 
 void MainWindow::exitApplication()
@@ -138,13 +140,17 @@ void MainWindow::exitApplication()
 void MainWindow::okPressed()
 {
     infoLabel->setText(tr("OK pressed"));
-    pushButton->setSoftKey(0);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKey(0);
 }
 
 void MainWindow::cancelPressed()
 {
     infoLabel->setText(tr("Cancel pressed"));
-    pushButton->setSoftKey(0);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKey(0);
 }
 
 
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 7b78033..663a1df 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -62,8 +62,8 @@ QMAKE_LFLAGS_DLL        = -shared
 QMAKE_LINK_OBJECT_MAX	= 10
 QMAKE_LINK_OBJECT_SCRIPT= object_script
 
-QMAKE_DESKTOPSERVICES_LIBS  = -lsendas2 -lsendui -lplatformenv -lcommonui -letext -lapmime
-QMAKE_STATUSPANE_LIBS       = -lavkon -leikcoctl
+QMAKE_DESKTOPSERVICES_LIBS  = -lsendas2 -lplatformenv -lcommonui -letext -lapmime
+QMAKE_STATUSPANE_LIBS       = -lavkon -leikcoctl       
 
 QMAKE_LIBS		= -llibc -llibm -leuser -llibdl
 QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv
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 );