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

Conflicts:
	dist/changes-4.5.2-tower

5 files changed, 159 insertions, 58 deletions

diff --git a/demos/embedded/anomaly/anomaly.pro b/demos/embedded/anomaly/anomaly.pro
index 5fe5625..cf9277e 100644
--- a/demos/embedded/anomaly/anomaly.pro
+++ b/demos/embedded/anomaly/anomaly.pro
@@ -21,9 +21,12 @@ SOURCES += src/Main.cpp \
     src/ControlStrip.cpp
 RESOURCES += src/anomaly.qrc
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
 symbian {
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock -lconnmon
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+    TARGET.UID3 = 0xA000CF71
 }
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index 92d9123..f6bac67 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -13,6 +13,7 @@
     <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"/>
+    <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.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 341b321..11d8a8c 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -72,7 +72,8 @@ symbian {
         desktopservices.exe \
         fridgemagnets.exe \
         drilldown.exe \
-        softkeys.exe
+        softkeys.exe \
+        anomaly.exe
 
     executables.path = /sys/bin
 
@@ -88,7 +89,8 @@ symbian {
          $${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/softkeys_reg.rsc
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
 
     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
 
@@ -105,7 +107,8 @@ symbian {
          $${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/softkeys.rsc
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
 
     resource.path = $$APP_RESOURCE_DIR
 
diff --git a/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png b/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png
new file mode 100644
index 0000000..b9a73fd
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png
diff --git a/dist/changes-4.5.2-tower b/dist/changes-4.5.2-tower
index 4c2c270..14c0b8a 100644
--- a/dist/changes-4.5.2-tower
+++ b/dist/changes-4.5.2-tower
@@ -4,7 +4,7 @@ Qt 4.5.2-tower
 The Qt for S60 "Tower" release is the fifth pre-release from the Qt for
 S60 porting project. "Tower" is based on the Qt 4.5 codebase (mostly Qt 4.5.2).
 
-This list of changes lists S60 spesific fixes,
+This list of changes lists S60 spesific fixes only,
 for general 4.5.x changes go to:
 
   http://www.qtsoftware.com/developer/changes/changes-4.5.0
@@ -33,7 +33,8 @@ New modules
       provided only in binary format.
 
 - QtWebkit
-    * Experimental webkit build for S60. Can be enabled by passing -webkit to configure.
+    * Experimental webkit build for S60. Can be enabled by passing -webkit
+      to configure.
 
 - Phonon
     * The Phonon library is now part of Qt, but it comes without a backend.
@@ -41,6 +42,17 @@ New modules
       library, but there is currently no S60 backend plugin providing actual
       multimedia playback. Possible alternatives such as Helix and MMF are
       being investigated.
+- Input methods
+    * Added events to support opening and closing the virtual keyboard, called
+      software input panel in Qt.
+    * Added an option to QApplication to choose between single or double click
+      input panel activation.
+    * Added input method hints API to Qt. These can be used to instruct input methods
+      to only allow certain characters or tailor their appearance.
+    * Added Qt::ImAnchorPosition to support querying for selections through input
+      methods.
+    * Added QInputMethodEvent::Selection to support setting the selection through
+      input methods.
 
 Ported classes
 --------------
@@ -49,21 +61,29 @@ Ported classes
     * Implemented CMdaAudioPlayerUtility based Symbian backend for QSound.
 
 - QLocalSocket and QLocalServer
-    * Added support for QLocalSocket and QLocalServer on Symbian
+    * Added support for QLocalSocket and QLocalServer on Symbian.
+
+- QColormap
+    * Added basic implementation of QColormap for Symbian.
 
 Features
 --------
 
 - QApplication
-    * Implemented QApplication::beep() for Symbian
+    * Implemented QApplication::beep() for Symbian.
 
 - QSslSocket
     * Added support for -openssl option i.e. runtime resolving of OpenSSL
-      symbols
+      symbols.
 
 - QWidget
     * Basic widgets are now navigatable and usable via keypad on SDK 3
       FP 1 and FP 2.
+    * Widgets can now be made semi-transparent on systems that support it
+      using Qt::WA_TranslucentBackground.
+
+- QPixmap
+    * Added supported for converting to/from CFbsBitmap
 
 Optimizations
 -------------
@@ -72,69 +92,75 @@ Optimizations
     * Optimized drawing operations for RVCT builds, particulary for ARMV6.
 
 - qwidget_s60.cpp
-    * Avoid unnecessary calls to FocusChanged in Symbian
+    * Avoid unnecessary calls to FocusChanged in Symbian.
+
+- qwindowsurface_s60.cpp
+    * Avoid updating raster buffer pointer on window hide
+
+- QFont
+    * Use cached DPI for metrics.
 
 ****************************************************************************
 *                          Code clean-up                                   *
 ****************************************************************************
 
 - Cleanup qeventdispatcher_unix.cpp
-    * 247268: All qeventdispatcher_unix.cpp changes were reverted since,
+    * 247268: All qeventdispatcher_unix.cpp changes were reverted since
     this file is not anymore used in Symbian OS branch.
 
 - Cleanup QtNetwork workarounds implemented earlier due to Open C bugs.
-    * 247287: Removed getaddrinfo workaround
-    * 247288: Removed waitForConnected workaround
-    * 247289: Removed qt_socket_accept workaround
-    * 247290: Removed qt_socket_connect workaround
-    * 247290: Removed E32IONREAD workaround
-    * 247293: Removed nativeHasPendingDatagrams workaround
+    * 247287: Removed getaddrinfo workaround.
+    * 247288: Removed waitForConnected workaround.
+    * 247289: Removed qt_socket_accept workaround.
+    * 247290: Removed qt_socket_connect workaround.
+    * 247290: Removed E32IONREAD workaround.
+    * 247293: Removed nativeHasPendingDatagrams workaround.
     * 247295: Removed QNativeSocketEnginePrivate::nativeRead EPIPE
-      workaround
+      workaround.
 
 - Other code clean-ups
     * 247278: Removed unnecessary includes from qbackingstore.cpp.
-    * Fixed Q_OS_SYMBIAN ifdef usage in qfiledialog_p.h
+    * Fixed Q_OS_SYMBIAN ifdef usage in qfiledialog_p.h.
     * 247272: Removed qtestnetworkservers.h dependency, used
-      network-settings.h
+      network-settings.h.
     * Revert "Work around compiler bug on Nokia Metrowerks compiler."
-    * Remove UI highlights being inverted colors based on highlight text colors.
-
+    * Remove UI highlights being inverted colors based on highlight text 
+      colors.
 
 ****************************************************************************
 *                          Build issues                                    *
 ****************************************************************************
 
+- Macros
+    * QT_NO_DEBUG now properly defined in release mode.
 - QTest
     * Fixed testlib export macros for RVCT builds.
 
-- namespaces
-    * Now builds when -qtnamespace option is defined 
+
+- Namespaces
+    * Now builds when -qtnamespace option is defined.
 
 ****************************************************************************
 *                          Changes to existing classes                     *
 ****************************************************************************
 
 - QDesktopServices
-    * Fixed forwardslash/backslash usage as an path separator
+    * Fixed forwardslash/backslash usage as an path separator.
 
 - QPluginLoader
     * QPluginLoader will look for plugin stubs from the same folder on other
       drives if it can't find them from the indicated drive.
 
-- QEventDispatcher
-    * Lowered the timeout for reprioritizing the process to 100ms
-
 - QNetworkInterface
-    * Fixed R-handle leak in Symbian version of qnetworkinterface_unix.cpp
+    * Fixed R-handle leak in Symbian version of qnetworkinterface_unix.cpp.
     * Introduced a new qnetworkinterface_symbian.cpp, because there wasn't
-      really anything common to UNIX equivalent
+      really anything common to UNIX equivalent.
 
 - QHostInfo
     * Added support for host lookups with multiple ipv4 addresses.
 
 - QUdpSocket
-    *  Updated BindFlag documentation to reflect behaviour on Symbian OS
+    * Updated BindFlag documentation to reflect behaviour on Symbian OS.
 
 - QLocale
     * Removed workaround for missing tzname symbol, fixes QLocal timeZone
@@ -144,7 +170,7 @@ Optimizations
     * Fixed temporary file rename in Symbian OS.
 
 - QThread
-    * Fix for thread termination in Symbian OS.
+    * Fixed thread termination in Symbian OS.
 
 - QIoDevice
     * Fixed compilation error when QIODEVICE_DEBUG is defined.
@@ -152,13 +178,16 @@ Optimizations
 - QS60Style
     * Added subElementRect implementation for SE_ItemViewItemCheckIndicator.
     * Added support for E90 layouts.
-    * Added support for QScrollArea, QTextEditor, QGroupBox, QTreeView, QToolBar and QDial styling.
+    * Added support for QScrollArea, QTextEditor, QGroupBox, QTreeView, 
+      QToolBar and QDial styling.
     * Better support for theme and layout changes.
     * Better support for themed palettes and themed text colors.
     * Better support for multiselection in item views.
     * Better theming for QTable and QPanel.
-    * Better support of highlight graphics and texts for QLists, QTreeViews, QCalendarWidgets and QComboBoxes.
-    * Support polishing fonts. Fonts are no longer changed within the drawing code.
+    * Better support of highlight graphics and texts for QLists, QTreeViews, 
+      QCalendarWidgets and QComboBoxes.
+    * Support polishing fonts. Fonts are no longer changed within the drawing 
+      code.
     * Draw spinbox arrowbuttons side-by-side, instead one on top of the other.
     * Harmonize widget drawing so that widgets are of similar height.
     * Support check states for QLists and QPushButtons.
@@ -169,12 +198,14 @@ Optimizations
     * Separate theme background for QDialogs.
     * Clarify QToolButton pressed state.
     * Removed linedrawing of panels and groupboxes.
-    * Fix palette-polution for a style that is activated from an application after S60Style has been in use.
+    * Fix palette-polution for a style that is activated from an application 
+      after S60Style has been in use.
     * Fix for frame masks with color depth other than EGrey2.
     * Fix for squeezed QTabBars.
     * Fix memory leak when color skinning graphics.
     * Show focus/Editfocus visualization for KeyPad navigation on
-      SDK 3 FP 1 and FP 2
+      SDK 3 FP 1 and FP 2.
+    * Fix for overwriting user specified palettes.
 
 - QDesktopServices
     * Switched QDesktopServices mail-to URL handling to RSendAs in Symbian,
@@ -182,57 +213,116 @@ Optimizations
       correctly. Currently e-mail sending with qdesktopservices::openUrl
       works in Symbian only if e-mail account already exists.
 
+- QInputContext
+    * Added QInputContext::s60FilterEvent().
+
 - QCoeFepInputContext (non-public)
     * Fixes FEP crash when changing the focused Qt widget to NULL.
+    * Fixed a bug where the virtual keyboard could not be opened if there
+      was only one input widget.
+    * Fixed a crash in FEP when exiting application.
+
+- QKeyMapper (non-public)
+    * Fixed a broken keymapping where Enter key would be mapped to Tab.
 
 - QApplication
     * 252798: Fixed layout when orientation changed via
       AknAppUi::SetOrientationL.
-    * Generating MouseEvents has gone through several changes
+    * Generating MouseEvents has gone through several changes.
+    * qt_init() has been changed: auto flush is always enabled for
+      window server sessions on 3.1 SDK for both UDEB and UREL.
+    * Added support for '-graphics-system' command line option
 
 - QUdpSocket
     * Wrote hack for QUdpSocket::writeDatagram return value in Symbian OS.
 
 - QNativeSocketEnginePrivate (non-public)
-    * Changed select to listen also expectfds in Symbain OS for given
-      sockets (Workaround to Open C bug).
-    * Fix to Open C bug: Socket connect failure is indicated exception set.
+    * Socket connect and listen failure is indicated in exception set. 
+      (Workaround to Open C bug)
 
 - QEventDispatcherSymbian (non-public)
-    * Fixed ASSERT panic in Symbian event dispatcher
-    * 246600: Fix problem in eventdispatcher destructor / AO canceling
-    * Fixed active scheduler removal when calling QThread::terminate
+    * Lowered the timeout for reprioritizing the process to 100ms.
+    * Fixed ASSERT panic in Symbian event dispatcher.
+    * 246600: Fix problem in eventdispatcher destructor / AO canceling.
+    * Fixed active scheduler removal when calling QThread::terminate.
     * Fix to Open C bug: select sometimes returns -1 and errno is
-      ECONNREFUSED
+      ECONNREFUSED.
+    * Fix a crash when using QEventLoop::ExcludeSocketNotifiers flag.
+    * Changed to round robin scheduling for Qt's active objects. Other
+      active objects will still be scheduled like before.
+    * Fixed crash if events are posted before QApplication construction
 
 - QWidget
-    * Added API for setting softkeys
+    * Added API for setting softkeys.
+    * Fixed background painting. Background can now be overwritten from
+      setting the respective palette role.
+    * Add support for Qt::WA_TranslucentBackground.
 
 - QMenuBar
-    * Native menus are handled properly even when application has multiple QMainWindows
-    * Fixed a bug causing both native and qt menu to be created
-    * Fix for disappearing options menu after coming back from dialog
+    * Native menus are handled properly even when application has multiple 
+      QMainWindows.
+    * Fixed a bug causing both native and qt menu to be created.
+    * Fix for disappearing options menu after coming back from dialog.
 
 - QFontDataBase
-    * Now, also fonts from the user's /resources/fonts direactories are
+    * Now, also fonts from the user's /resources/fonts directories are
       available.
 
 - QFontMetrics
     * Fixed the boundingRect calculation for text.
 
+- QFontEngine
+    * Fix the vertical advance of glyph metrics.
+
+- QPlainTextEdit
+    * Added support for input methods.
+
+- QTextEdit
+    * Added support for input methods.
+
+- QGraphicsTextItem
+    * Added support for input methods.
+
+- QGraphicsView
+    * Added support for input methods to the the viewport.
+
+- QLocalSocket
+    * Connecting to QLocalServer is always done in blocking mode.
+
+- QSelectThread
+    * We force monitoring sockets exception status as well, and not
+      just read/write.
+    * Notification related to the particular socket signaled via exception
+      fd_set will be mapped to the appropriate read/write notification.
+
+- QDebug
+    * Fixed debug printing (incl. qWarning, qFatal) for strings longer
+      than 256 characters.
+
+- QDesktopWidget
+    * 253930: Implement proper resize behavior and emit necessary signals.
+
+- QTest
+    * Disable keypad navigation for autotests by default
+
+- QPixmap
+    * Added fromSymbianCFbsBitmap() and toSymbianCFbsBitmap().
+
 ****************************************************************************
 *                          Examples and demos                              *
 ****************************************************************************
 
 - Drilldown
-    * Added to demonstrate QtSql usage in Symbian OS
+    * Added to demonstrate QtSql usage in Symbian OS.
 
 - Deform, Pathstroke, and Wiggly
     * Removed Symbian specific animation timer fixes since more generic
       fix was made to event dispatcher.
 
 - Ftp
-    * Enabled default iap setting for FTP example
+    * Enabled default IAP setting for FTP example.
+    * IAP dialog will show after FTP UI is on screen.
+    * If active IAP exist that one will be used.
 
 - DesktopServices
     * Implemented content filters for desktopservices example.
@@ -244,17 +334,17 @@ Optimizations
 - Fluidlauncher
     * Removed ugly workaround to make emulator deployment work correctly,
       since the issue has been fixed in qmake.
-    * Included drilldown to demonstrate QtSql usage
-    * Updated screenshots to S60 style
-    * Added softkeys example
+    * Included drilldown to demonstrate QtSql usage.
+    * Updated screenshots to S60 style.
+    * Added softkeys example.
 
 - Softkeys
-    * New example showing how to use softkeys API in QWidget
-
+    * New example showing how to use softkeys API in QWidget.
 
 ****************************************************************************
 *                          Tools                                           *
 ****************************************************************************
+
 - qmake
     * Support for generating Symbian "test" targets: CONFIG += symbian_test.
     * Support for Symbian Build System, version 2 (aka Raptor) via
@@ -281,13 +371,15 @@ Optimizations
     * Now creates packages with .sis suffix.
 
 - Patch_capabilities script
-    * Will now patch also vendor id.
+    * Will now patch also vendor id in binaries and the UID in the pkg file.   
+
 
 ****************************************************************************
 *                          Documentation                                   *
 ****************************************************************************
+
 - qmake-manual
-    * 250370: Added documentation for ICON keyword
+    * 250370: Added documentation for ICON keyword.
 
 ****************************************************************************
 *                          Plugins                                         *
@@ -309,3 +401,5 @@ Optimizations
       of Qt libs is desired.
     * QtCore and QtSql made UNPAGED as workaround for an obscure crash
       when they are paged.
+    * qt_libs.pro updated to reflect Open C dependencies, as Qt requires
+      1.5.0 and newer release.