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

8 files changed, 55 insertions, 40 deletions

diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index 41b3b6d..b543fa2 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -12,6 +12,7 @@
     <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"/>
   </demos>
   <slideshow timeout="60000" interval="10000">
     <imagedir dir="slides"/>
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 9c08801..341b321 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -71,10 +71,11 @@ symbian {
         saxbookmarks.exe \
         desktopservices.exe \
         fridgemagnets.exe \
-        drilldown.exe
+        drilldown.exe \
+        softkeys.exe
 
     executables.path = /sys/bin
-    
+
     reg_resource.sources = \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
@@ -83,14 +84,15 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \       
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc
-  
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc
+
     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
 
-    
+
     resource.sources = \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
@@ -102,10 +104,11 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc
-  
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc
+
     resource.path = $$APP_RESOURCE_DIR
-    
+
     mifs.sources = \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C611.mif
     mifs.path = $$APP_RESOURCE_DIR
@@ -131,7 +134,7 @@ symbian {
     saxbookmarks.sources += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel
     saxbookmarks.path = /data/qt/saxbookmarks
 
-    DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \ 
+    DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \
         mifs desktopservices_music desktopservices_images
 
     TARGET.EPOCHEAPSIZE = 100000 20000000
diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys.png b/demos/embedded/fluidlauncher/screenshots/softkeys.png
new file mode 100644
index 0000000..99681b9
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/softkeys.png
diff --git a/dist/changes-4.5.2-tower b/dist/changes-4.5.2-tower
index 19e8d3c..41dc8c8 100644
--- a/dist/changes-4.5.2-tower
+++ b/dist/changes-4.5.2-tower
@@ -31,10 +31,13 @@ New modules
     * Implemented QtSql module with sqlite3 backend. For now backend is
       provided only in binary format.
 - QtWebkit
-    * todo
+    * Experimental webkit build for s60. Can be enabled by passing -webkit to configure.
 - Phonon
-    * todo
-
+    * The Phonon library is now part of Qt, but it comes without a backend.
+      This means that applications can build and run against the Phonon
+      library, but there is currently no S60 backend plugin providing actual
+      multimedia playback. Possible alternatives such as Helix and MMF are
+      being investigated.
 
 New classes
 ------------
@@ -101,6 +104,8 @@ Optimizations
 
 - QTest
     * Fixed testlib export macros for RVCT builds.
+- namespaces
+    * Now builds when -qtnamespace option is defined 
 
 ****************************************************************************
 *                          Changes to existing classes                     *
@@ -177,6 +182,7 @@ Optimizations
 - QApplication
     * 252798: Fixed layout when orientation changed via
       AknAppUi::SetOrientationL.
+    * Generating MouseEvents has gone through several changes
 
 - QUdpSocket
     * Wrote hack for QUdpSocket::writeDatagram return value in Symbian OS.
@@ -241,6 +247,7 @@ Optimizations
     * -cetest is no longer a supported switch for configure.
     * -stl option is enabled by default for Symbian OS
     * -openssl option is enabled by default for Symbian OS.
+    * -fpu option enables vfpu type selection for ARM targets.
 
 - Release package creation
     * Removed the obsolete script to create release package.
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 60d3034..9768162 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -487,6 +487,34 @@ void QFileDialog::changeEvent(QEvent *e)
     QDialog::changeEvent(e);
 }
 
+QFileDialogPrivate::QFileDialogPrivate()
+    :
+#ifndef QT_NO_PROXYMODEL
+        proxyModel(0),
+#endif
+        model(0),
+        fileMode(QFileDialog::AnyFile),
+        acceptMode(QFileDialog::AcceptOpen),
+        currentHistoryLocation(-1),
+        renameAction(0),
+        deleteAction(0),
+        showHiddenAction(0),
+        useDefaultCaption(true),
+        defaultFileTypes(true),
+        fileNameLabelExplicitlySat(false),
+        nativeDialogInUse(false),
+#ifdef Q_WS_MAC
+        mDelegate(0),
+#ifndef QT_MAC_USE_COCOA
+        mDialog(0),
+        mDialogStarted(false),
+        mDialogClosed(true),
+#endif
+#endif
+        qFileDialogUi(0)
+{
+}
+
 QFileDialogPrivate::~QFileDialogPrivate()
 {
 }
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h
index 99f61f0..3195583 100644
--- a/src/gui/dialogs/qfiledialog_p.h
+++ b/src/gui/dialogs/qfiledialog_p.h
@@ -113,31 +113,7 @@ class Q_AUTOTEST_EXPORT QFileDialogPrivate : public QDialogPrivate
     Q_DECLARE_PUBLIC(QFileDialog)
 
 public:
-    QFileDialogPrivate() :
-#ifndef QT_NO_PROXYMODEL
-    proxyModel(0),
-#endif
-    model(0),
-    fileMode(QFileDialog::AnyFile),
-    acceptMode(QFileDialog::AcceptOpen),
-    currentHistoryLocation(-1),
-    renameAction(0),
-    deleteAction(0),
-    showHiddenAction(0),
-    useDefaultCaption(true),
-    defaultFileTypes(true),
-    fileNameLabelExplicitlySat(false),
-    nativeDialogInUse(false),
-#ifdef Q_WS_MAC
-    mDelegate(0),
-#ifndef QT_MAC_USE_COCOA
-    mDialog(0),
-    mDialogStarted(false),
-    mDialogClosed(true),
-#endif
-#endif
-    qFileDialogUi(0)
-    {}
+    QFileDialogPrivate();
 
     void createToolButtons();
     void createMenuActions();
diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h
index 8791a5c..dfa4933 100644
--- a/src/gui/kernel/qaction.h
+++ b/src/gui/kernel/qaction.h
@@ -94,7 +94,7 @@ public:
     enum SoftKeyRole { OptionsSoftKey, SelectSoftKey, BackSoftKey, NextSoftKey, PreviousSoftKey, 
                     OkSoftKey, CancelSoftKey, EditSoftKey, ViewSoftKey, BackSpaceSoftKey, 
                     EndEditSoftKey, RevertEditSoftKey, DeselectSoftKey, FinishSoftKey, 
-                    MenuSoftKey, ContextMenuSoftKey, Key1SoftKey, Key2SoftKey, 
+                    MenuSoftKey, ContextMenuSoftKey, ExitSoftKey, Key1SoftKey, Key2SoftKey, 
                     Key3SoftKey, Key4SoftKey, CustomSoftKey };
     explicit QAction(QObject* parent);
     QAction(const QString &text, QObject* parent);
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 680bbaa..1edd466 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -731,7 +731,7 @@ private:
     friend class QGraphicsProxyWidget;
     friend class QGraphicsProxyWidgetPrivate;
     friend class QStyleSheetStyle;
-    friend class QWidgetExceptionCleaner;
+    friend struct QWidgetExceptionCleaner;
 
 #ifdef Q_WS_MAC
     friend class QCoreGraphicsPaintEnginePrivate;