Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (28 commits)
  Symbian: Parse ts filenames case-insensitively for localize_deployment
  Do not crash in copy() of pixmaps without an underlying bitmap
  QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8
  Doc updates to Qt for Symbian installation instructions and platform notes.
  Doc updates to platform notes document.
  Fix accessible menu not returning child name.
  Fix broken qglthreads autotest build on Solaris.
  Doc updates to platform notes of Qt 4.8 doc.
  Disabled activeqt/webbrowser example from mingw build.
  Don't store the alignment attribute for spacers
  Doc updates to Qt 4.8 platform notes documentation.
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8
  Fix broken Solaris build (getpwnam_r usage)
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  Update changelog for Qt 4.8
  ...

23 files changed, 282 insertions, 155 deletions

diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0
index 27c6774..5dd1d8a 100644
--- a/dist/changes-4.8.0
+++ b/dist/changes-4.8.0
@@ -33,7 +33,7 @@ General Improvements
 Third party components
 ----------------------
 
- - Updated libpng to version 1.5.1
+ - Updated libpng to version 1.5.4
  - Updated libjpeg to version 8c
  - Updated zlib to version 1.2.5
 
@@ -50,22 +50,38 @@ QtCore
  - QMutexLocker: improved performence of the non contended case by inlining some function
  - QThreadStorage: Added possibility to store object by value instead of by pointer [QTBUG-15033]
  - QThread: fixed few race conditions [QTBUG-17257, QTBUG-15030]
+ - QtConcurrent: Entry points were re-written and interfaces changed. This work was
+done in order to add support for QtConcurrent on Symbian, but ultimately it was noted
+that the changes lead to a leaner API and the change applies to all platforms.
  - QtConcurrent: added support for c++0x lambda in few functions
  - QObject: Improved performence of the signal activation
  - QObject: added ways to connect signals using QMetaMethod
+ - QObject: added senderSignalIndex method to discover the signal that invoked a slot
  - QObject: deprecated qFindChild and qFindChildren
  - QObject: optimize constructions and destruction of objects
  - QObject: Qt::BlockingQueuedConnection can handle the return value [QTBUG-10440]
  - QList/QVector/QStringList: added C++0x initilizer lists constructors.
+ - QList: optimizations
  - QVarLenghtArray: added method for consistency with QVector
  - QStringBuilder: added support for QByteArray
  - qSwap now uses std::swap, specialized std::swap for our container to work better with stl algoritms
+ - Added member-swap function to containers and implicitly shared (including GUI) classes
  - QVariant: deprecated global function qVariantSetValue, qVariantValue, qVariantCanConvert, qVariantFromValue
  - QUrl: add method for retrieving effective top level domain [QTBUG-13601] (MR-1205)
  - optimised performance of QFileInfo, QDir, QDirIterator, these classes now share metadata and access the filesystem less
  - QFile: new open() overloads allow control over whether QFile should close an adopted file handle or not
  - Fix QProcess emitting two started signals on X11 [QTBUG-7039]
  - QLocale: added locale dependent to{Upper,Lower} string conversions
+ - QUuid: Optimize QUuid::toString() and relevant, circa 20 times faster than before on the test machine. [QTBUG-19418]
+ - QUuid: Add QUuid::toByteArray() and relevant, same behavior with QUuid::toString(). [QTBUG-19419]
+ - QUuid: Add QUuid::toRfc4122() and fromRfc4122(), provide interfaces by following the RFC-4122 [QTBUG-19420]
+ - QTextStream, QDataStream and QXmlStreamWriter: added write error reporting [QTBUG-376]
+ - QProcessEnvironment: added keys() and insert(const QProcessEnvironment &)
+ - QProcessEnvironment: preserve variable name case on Windows
+ - QProcessEnvironment: made systemEnvironment() encoding-safe
+ - QProcessEnvironment: major optimizations, especially on Unix
+ - Add branch prediction macros Q_LIKELY and Q_UNLIKELY
+ - QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
 
 QtGui
 -----
@@ -75,7 +91,7 @@ QtGui
  - QComboBox: Fixed a color propagation issue with the lineedit. [QTBUG-5950]
  - QGraphicsLayout: Made setInstantInvalidatePropagation() public
  - Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4
- - QListView diverses optimisations [QTBUG-11438]
+ - QListView diverse optimisations [QTBUG-11438]
  - QTreeWidget/QListWidget: use localeAwareCompare for string comparisons [QTBUG-10839]
  - PNG image I/O: Much improved support for text annotations, including iTXt fields.
  - QRawFont and QGlyphRun are introduced for low-level text rendering. [QTBUG-18252]
@@ -92,6 +108,8 @@ QtGui
  - QPainter: Added a fast stroking algorithm for thin (< 1px wide) aliased and antialiased
    lines, giving a huge improvement in drawing speed for certain cases
  - Fixed a rare race condition when showing toplevel windows on X11
+ - QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed, that
+   caused unnecessary update events
  - Accessibility: Fix potential crash in QDockWidget.
  - Accessibility: Fix crash when asking for relations of child accessibles.
  - Accessibility: More consistency in reporting names (especially when widget is invisible).
@@ -106,6 +124,9 @@ QtGui
  - Accessibility: Several enablers for accessible graphicsview and Qt Quick applications.
  - Fixed loading BMP files with version 4 and 5 headers, ignoring extra data.
  - QTextCursor optimization
+ - QUndoGroup, QUndoStack: Allow using not only prefixes for undo command text [QTBUG-14442]
+ - QUndoView: Allow different text for undo actions and items
+ - QCommonStyle: Fix overrides from the proxy style [QTBUG-20849]
 
 QtNetwork
 ---------
@@ -121,6 +142,7 @@ QtNetwork
  - HTTP cache: do not load resources from cache that must be revalidated [QTBUG-18983]
  - HTTP cache: change file organization (MR-2505)
  - SOCKS5: write errors are propagated to the outer socket [QTBUG-18713]
+ - QNetworkReply: errorString() returns translated messages now [QTBUG-18382]
 
  QtOpenGL
  --------
@@ -132,6 +154,8 @@ QtNetwork
  - Optimize behavior of QGLTextureCache
  - Support subpixel antialiasing when possible.
  - [QTBUG-13450] Fixed path drawing on FBOs without stencil buffer.
+ - Reading from the FrameBuffer with Qt now correctly gives an image
+   marked as premultiplied.
 
 QtScript
 --------
@@ -141,6 +165,11 @@ QtDBus
 ------
  - Added a method that returns the local machine ID
 
+QtWebKit
+--------
+ - Update QtWebKit to 2.2.0
+   http://trac.webkit.org/wiki/QtWebKitRelease22
+
 QtSql
 -----
  - Update sqlite to 3.7.7.1
@@ -196,6 +225,8 @@ Qt for Embedded Linux
    keyboard and screen drivers.
  - Improved support for INTEGRITY RTOS
  - Allow hard-coding the temp path in mkspecs (QT_UNIX_TEMP_PATH_OVERRIDE define)
+ - Added support for opening LinuxInput devices exclusively (via ioctl EVIOCGRAB)
+ - Added eglnullws QScreen driver for use with OpenGL ES EGL null window system (NullWS).
 
 Qt for Symbian
 --------------
@@ -239,6 +270,8 @@ Qt for Symbian
  - Fixed QProcess::waitForFinished WaitForRequest handling in Symbian [QT-4659]
  - Changed DEPLOYMENT keyword to accept both .sources and .files [QTBUG-3216]
  - Removed static vs dynamic library autodetection from qmake in Symbian [QTBUG-13498]
+ - QtConcurrent is now working both with RVCT 2.2 and GCCE 4.4.1 on Symbian, but not with WINSCW,
+the compiler of Symbian emulator (and there is no plan to support it). [QTBUG-5182] [QTBUG-9070]
 
 Qt for Windows CE
 -----------------
@@ -294,24 +327,33 @@ Qt for Windows CE
 
 
 - qmake
+    * Look for external Qt modules in $QMAKEPATH
     * MinGW: fix DEF_FILE for shadow builds. (QTBUG-11643)
-
-- qmake - Visual Studio project generator
-    * Support x64 Qt builds. (QTBUG-17911)
-    * QMAKE_PROJECT_NAME qmake variable introduced to set the project's name.
-    * Support PCHs with other extensions than ".h". (QTBUG-16639)
-    * Fix setting PCH options manually via the MSVC compiler flags.
-      (QTBUG-15594)
-    * Set the output directory correctly. (QTBUG-16490)
-    * Fix handling of DEFINES from .prl files. (QTBUG-16024)
-    * Fix the language settings generated Windows resource files.
-      (QTBUG-12249)
     * Implemented "aux" template that allows making use of the INSTALLS variable
       without building anything. Needed for projects with QML entry point.
+    * MSVC now link with /DYNAMICBASE /NXCOMPAT in order to increase security.
+    * Fix the language settings in generated Windows resource files. (QTBUG-12249)
+    * Write and install pkg-config files for MinGW
+    * Make PKGCONFIG referencing missing packages fatal; add packagesExist() for
+      a-priori checks. (QTBUG-11418)
+    * Make moc use DEFINES from pkg-config. (QTBUG-19922)
+    * Parsing nested quotes works a bit differently now
+    * Added -unset <prop> option
+    * Made the Hurd mkspec useful
+    * Visual Studio project generator
+      - Support x64 Qt builds. (QTBUG-17911)
+      - QMAKE_PROJECT_NAME qmake variable introduced to set the project's name.
+      - Support PCHs with other extensions than ".h". (QTBUG-16639)
+      - Fix setting PCH options manually via the MSVC compiler flags. (QTBUG-15594)
+      - Set the output directory correctly. (QTBUG-16490)
+      - Fix handling of DEFINES from .prl files. (QTBUG-16024)
 
 - configure
     * The endianness for Windows is always set to little endian.
-
+    * [QTBUG-5710] Configure now complains on missing perl on windows
+    * Removed obsolete -qt-gif option
+    * Allow setting LD, RANLIB, OBJDUMP, and STRIP.
+    * Allow selecting imageformats to be built as plugin vs. internal.
 
 - qtconfig
   * removed Qt3support dependency
@@ -323,6 +365,9 @@ Qt for Windows CE
     * New tool to generate text descriptions of the QML components defined
       in plugins loaded by a QML module.
 
+- syncqt
+    * Fix to allow $QTDIR to contain any valid pathname characters.
+
 ****************************************************************************
 *                          Plugins                                         *
 ****************************************************************************
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 36d63f5..2936d60 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -510,7 +510,10 @@ in the \l{Qt for the Symbian platform Requirements} document.
 
 \section1 Step 1: Install Qt
 
-        Run \c{qt-symbian-opensource-%VERSION%.exe} and follow the instructions.
+        Download the \c {Qt libraries 4.x for Windows} package (for \c minGW or \c {VS 2008}) 
+        from the \l {http://qt.nokia.com/downloads#qt-lib}{downloads} page.
+        
+        Run the downloaded package and follow the instructions.
 
         \note Qt must be installed on the same drive as the Symbian SDK you are
         using, and the install path must not contain any spaces.
@@ -652,23 +655,39 @@ Binary Package} document.
     Congratulations, Qt is now ready to use.
 
 \section1 Step 7: Installing Qt Libraries on the Device
+    
+    To run a Qt application on a device, it must have Qt libraries installed.
+    
+    Symbian devices have a pre-installed Qt as follows:
+    \list
+    \o Symbian Anna devices have the pre-installed Qt, Qt Mobility, and Qt Webkit.
+    \o Symbian Belle and later devices have the pre-installed Qt on the device firmware.
+    \endlist
+    
+    \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}
+    {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60 
+    and Symbian devices if the libraries are not pre-installed.
+    
+    Nokia Developer site's \l {http://www.developer.nokia.com/Devices/Device_specifications/?filter1=qt}
+    {Device specifications} provide information on which devices have a
+    pre-installed Qt and the used Qt version.
+    
+    To create your own Qt installation package, do as follows:
+
+    \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
+
+    The Qt libraries are built with "All -Tcb" capability, so they can support 
+    all types of applications. If you don't have a suitable certificate, you can 
+    patch the binaries in either of the following ways:
+    
+    \list
+    \o If you have no certificate, build a self-signed Qt:
+    \snippet doc/src/snippets/code/doc_src_installation.qdoc 34
 
-    To run the demo on a real device, you first have to install
-    the Qt libraries on the device:
-
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 29
-
-    The Qt libraries are built with "All -Tcb" capability, so that
-    they can support all types of application.
-    If you don't have a suitable certificate, it is possible to patch
-    the binaries as follows:
-
-    If you have no certificate, build a self signed Qt:
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 34
-
-    If you have a symbian-signed developer certificate, specify the
+    \o If you have a symbian-signed developer certificate, specify the
     capabilities you can sign for, for example:
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 35
+    \snippet doc/src/snippets/code/doc_src_installation.qdoc 35
+    \endlist
 
 \section1 Running Qt demos
 
@@ -1315,7 +1334,12 @@ We hope you will enjoy using Qt.
     \brief Setting up the Symbian platform environment for Qt.
     \previouspage General Qt Requirements
 
-    Qt for the Symbian platform requires the following software installed on your development PC:
+    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools 
+    and libraries for developing Qt applications. However, if you want to build 
+    Qt itself for Symbian, follow the instructions below.
+    
+    Qt for the Symbian platform requires the following software installed on 
+    your development PC:
     \list
         \o \l{http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/}{Carbide.c++ v2.3.0 or higher recommended}.
            \list
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 477f125..e1e8c44 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -685,9 +685,7 @@
     \ingroup platform-specific
     \brief Information about the state of support for the Symbian platform.
 
-    As with any port, the maturity for Qt for Symbian has not yet reached the
-    same level as other established Qt ports. This page documents the current
-    notes for the Symbian port.
+    This page documents the current notes for the Symbian port.
 
     \section1 Source Compatibility
 
@@ -698,18 +696,39 @@
 
     \section1 Binary Compatibility
 
-    As with every supported platform, we will strive to maintain
-    application behavior and binary compatibility throughout the lifetime of
-    the Qt 4.x series. However, due to the fact that Symbian support is newly
-    added in 4.6.0, there is a slight possibility that minor corrections to the
-    application binary interface (ABI) might be required in 4.6.1, in order to
-    ensure compatibility going forward. Any such change will be clearly
-    documented in the release notes for 4.6.1.
+    As with every supported platform, Qt strives to maintain application 
+    behavior and binary compatibility throughout the lifetime of the Qt 4.x 
+    major version and on the Symbian devices that support Qt. Symbian support in 
+    Qt SDK and Ovi Store were introduced with Qt 4.6. Each Qt release contains 
+    bug fixes that might change the API behavior and thereby affect application 
+    compatibility.
+
+    In addition, Symbian devices have different input methods, such as different 
+    keyboard styles or touch input, screen sizes, memory, and CPU and GPU 
+    capabilities. Therefore, you must test applications on specific target 
+    devices to ensure compatibility. In order to build applications that are 
+    supported also on earlier devices, select the target in Qt SDK carefully. 
+    Generally, an earlier target (such as S60 5th Edition) is supported on a 
+    larger number of devices than a later target (such as Symbian Belle).
 
     \section1 Supported Devices
 
-    See the list of supported devices at
-    http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian#Supported_Devices
+    \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian#Supported_Devices}{Nokia Smart Installer for Symbian}
+    documentation lists supported devices.
+
+    Qt versions are supported by Symbian devices as follows:
+    \list
+    \o Qt 4.6 is supported by S60 3rd Edition feature pack 1 and newer devices 
+    through \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}{Smart Installer}.
+    \o Qt 4.7.3 is supported by S60 5th Edition and newer devices.
+    \endlist
+    
+    Symbian devices have a pre-installed Qt support as follows:
+    \list
+    \o Symbian Anna: Qt 4.7.3 in C: drive.
+    \o Symbian Belle: Qt 4.7.4 in device firmware (ROM).
+    \endlist
+    
 
     \section1 Supported Functionality
 
@@ -729,17 +748,30 @@
     \endtable
 
     The following technologies have limited support:
+    
 
     \table
     \header \o Technology
             \o Note
     \row    \o QtSql
-            \o The only driver supported is SQLite.
+            \o The supported drivers are SQLite and QSYMSQL.
     \row    \o QtMultimedia
-            \o Although the module itself is supported, no backend for Symbian
-               is currently available. However, there is a backend available
-               for Phonon.
+            \o For support details see \l {Multimedia and Phonon Support} section.
     \endtable
+    
+    It is not recommended to use the following Qt widgets:
+    \list
+    \o QFileDialog with the \c DontUseNativeDialog option
+    \o QColorDialog with the \c DontUseNativeDialog option
+    \o QFontDialog
+    \o QWizard
+    \o QCalendarWidget
+    \o QDateTimeEdit
+    \o QMdiArea
+    \o QMdiSubWindow
+    \o QDockWidget
+    \o QPrintPreviewWidget
+    \endlist
 
     \section1 Compiler Notes
 
@@ -796,6 +828,7 @@
     For more information see the documentation of the individual Qt classes. If
     a class does not mention Symbian capabilities, it requires none.
 
+    \target Multimedia and Phonon Support
     \section1 Multimedia and Phonon Support
 
     Qt provides a high-level API for multimedia functionality with
@@ -808,7 +841,7 @@
 
     In this release the support is experimental. Video playback may show
     artifacts when the video is moved or resized (for instance during
-    orientation flips). This problem is present on Symbian^1 and earlier
+    orientation flips). This problem is present on S60 5th Edition and earlier
     versions, and on Symbian^3 systems.
 
     The audio and video formats that Phonon supports depends on what support
@@ -822,7 +855,7 @@
 
     \section1 Hardware Accelerated Rendering
 
-    The default graphics system on Symbian^3 is OpenVG, which uses OpenVG
+    The default graphics system on Symbian Anna is OpenVG, which uses OpenVG
     hardware to accelerate \l QPainter functions. There are a few exceptions,
     where Qt will use software rendering fallback.
 
@@ -839,7 +872,7 @@
 
     \section1 QtOpenGL Support in Symbian
 
-     Qt 4.7 introduces the \l {QtOpenGL} module to Symbian^3. QtOpenGL is
+     Qt 4.7 introduces the \l {QtOpenGL} module. QtOpenGL is
      supported on devices which support OpenGL ES 2.0. Symbian platforms prior
      to Symbian^3 are not supported.
 
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 79d257a..ad41a47 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -12,6 +12,9 @@ contains(QT_CONFIG, opengl):SUBDIRS += opengl
 # For now only the contain examples with mingw, for the others you need
 # an IDL compiler
 win32-g++*|wince*:SUBDIRS = webbrowser
+# Due to build problems, active qt was disabled from mingw build,
+# so we have to remove the only one left
+win32-g++*:SUBDIRS = 
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/activeqt
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 61a6228..c50dc77 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -151,11 +151,11 @@ SYMBIAN_SUPPORTED_LANGUAGES = \
     mr mo mn nb pl pt pa ro ru sr \
     si sk sl so es sw sv tl ta te \
     th bo ti tr tk uk ur vi cy zu \
-    nn eu zh gl fa st en_US fr_BE \
-    pt_BR en_CA fr_CA el_CY tr_CY \
-    en_TW en_HK en_CN en_JP en_TH \
-    sv_FI zh_HK es_419 en_ZA fr_CH \
-    de_CH it_CH zh_TW
+    nn eu zh gl fa st en_us fr_be \
+    pt_br en_ca fr_ca el_cy tr_cy \
+    en_tw en_hk en_cn en_jp en_th \
+    sv_fi zh_hk es_419 en_za fr_ch \
+    de_ch it_ch zh_tw
 
 # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
 QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
@@ -251,7 +251,8 @@ defineTest(matchSymbianLanguages) {
     # Cannot parse .ts file for language here, so detect it from filename.
     # Allow two and three character language and country codes.
     for(translation, TRANSLATIONS) {
-        language = $$replace(translation, "^(.*/)?[^/]+_(([^_]{2,3}_)?[^_]{2,3})\\.ts$", \\2)
+        low_translation = $$lower($$translation)
+        language = $$replace(low_translation, "^(.*/)?[^/]+_(([^_]{2,3}_)?[^_]{2,3})\\.ts$", \\2)
         !contains(HANDLED_LANGUAGES, $$language) {
             HANDLED_LANGUAGES += $$language
             # Make sure translation path is absolute or shadow builds will not work
diff --git a/mkspecs/features/symbian/localize_deployment.prf b/mkspecs/features/symbian/localize_deployment.prf
index 185c713..3e7f585 100644
--- a/mkspecs/features/symbian/localize_deployment.prf
+++ b/mkspecs/features/symbian/localize_deployment.prf
@@ -76,26 +76,26 @@ SYMBIAN_LANG.cy = 97            #Welsh
 SYMBIAN_LANG.zu = 98            #Zulu
 
 # Regional dialects
-SYMBIAN_LANG.en_US  = 10         #American English
-SYMBIAN_LANG.fr_BE  = 21         #Belgian French
-SYMBIAN_LANG.pt_BR  = 76         #Brazilian Portuguese
-SYMBIAN_LANG.en_CA  = 46         #Canadian English
-SYMBIAN_LANG.fr_CA  = 51         #Canadian French
-SYMBIAN_LANG.el_CY  = 55         #Cyprus Greek
-SYMBIAN_LANG.tr_CY  = 91         #Cyprus Turkish
-SYMBIAN_LANG.en_TW  = 157        #English as appropriate for use in Taiwan
-SYMBIAN_LANG.en_HK  = 158        #English as appropriate for use in Hong Kong
-SYMBIAN_LANG.en_CN  = 159        #English as appropriate for use in the Peoples Republic of China
-SYMBIAN_LANG.en_JP  = 160        #English as appropriate for use in Japan
-SYMBIAN_LANG.en_TH  = 161        #English as appropriate for use in Thailand
-SYMBIAN_LANG.sv_FI  = 85         #Finland Swedish
-SYMBIAN_LANG.zh_HK  = 30         #HongKong Chinese
+SYMBIAN_LANG.en_us  = 10         #American English
+SYMBIAN_LANG.fr_be  = 21         #Belgian French
+SYMBIAN_LANG.pt_br  = 76         #Brazilian Portuguese
+SYMBIAN_LANG.en_ca  = 46         #Canadian English
+SYMBIAN_LANG.fr_ca  = 51         #Canadian French
+SYMBIAN_LANG.el_cy  = 55         #Cyprus Greek
+SYMBIAN_LANG.tr_cy  = 91         #Cyprus Turkish
+SYMBIAN_LANG.en_tw  = 157        #English as appropriate for use in Taiwan
+SYMBIAN_LANG.en_hk  = 158        #English as appropriate for use in Hong Kong
+SYMBIAN_LANG.en_cn  = 159        #English as appropriate for use in the Peoples Republic of China
+SYMBIAN_LANG.en_jp  = 160        #English as appropriate for use in Japan
+SYMBIAN_LANG.en_th  = 161        #English as appropriate for use in Thailand
+SYMBIAN_LANG.sv_fi  = 85         #Finland Swedish
+SYMBIAN_LANG.zh_hk  = 30         #HongKong Chinese
 SYMBIAN_LANG.es_419 = 83         #Latin American Spanish
-SYMBIAN_LANG.en_ZA  = 48         #South African English
-SYMBIAN_LANG.fr_CH  = 11         #Swiss French
-SYMBIAN_LANG.de_CH  = 12         #Swiss German
-SYMBIAN_LANG.it_CH  = 61         #Swiss Italian
-SYMBIAN_LANG.zh_TW  = 29         #Taiwan Chinese
+SYMBIAN_LANG.en_za  = 48         #South African English
+SYMBIAN_LANG.fr_ch  = 11         #Swiss French
+SYMBIAN_LANG.de_ch  = 12         #Swiss German
+SYMBIAN_LANG.it_ch  = 61         #Swiss Italian
+SYMBIAN_LANG.zh_tw  = 29         #Taiwan Chinese
 
 isEmpty(SYMBIAN_MATCHED_LANGUAGES) {
     matchSymbianLanguages()
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 2c4373a..8db82d6 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -850,6 +850,7 @@ void SymbianCommonGenerator::parseTsFiles(SymbianLocalizationList *symbianLocali
 
             foreach (QString file, symbianTsFiles) {
                 QRegExp matcher(matchStr);
+                matcher.setCaseSensitivity(Qt::CaseInsensitive);
                 if (matcher.exactMatch(file) && parseTsContent(file, &loc))
                     break;
             }
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
index 82311d2..d8ba8a6 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
@@ -153,7 +153,7 @@ symbian {
     CONFIG += do_not_build_as_thumb
 
     CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3
-    # Symbian plugin support
+    # Symbian plugin support.
     LIBS += -lefsrv
 
     !CONFIG(QTDIR_build) {
@@ -303,7 +303,7 @@ win32-* {
 }
 
 # Remove whole program optimizations due to miscompilations
-win32-msvc2005|win32-msvc2008|wince*:{
+win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{
     QMAKE_CFLAGS_RELEASE -= -GL
     QMAKE_CXXFLAGS_RELEASE -= -GL
 
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h
index 01c6ac2..a9366ed 100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h
@@ -1,43 +1,43 @@
-/*

- * Copyright (C) 2009 Apple Inc. All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-#ifndef JSExceptionBase_h

-#define JSExceptionBase_h

-

-namespace JSC {

-    

-class JSValue;

-

-}   // namespace JSC

-

-namespace WebCore {

-

-class ExceptionBase;

-

-ExceptionBase* toExceptionBase(JSC::JSValue);

-

-} // namespace WebCore

-

-#endif // JSExceptionBase_h

+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JSExceptionBase_h
+#define JSExceptionBase_h
+
+namespace JSC {
+    
+class JSValue;
+
+}   // namespace JSC
+
+namespace WebCore {
+
+class ExceptionBase;
+
+ExceptionBase* toExceptionBase(JSC::JSValue);
+
+} // namespace WebCore
+
+#endif // JSExceptionBase_h
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 5e8533e..817cd38 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -880,7 +880,12 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded
         passwd *tmpPw;
         char buf[200];
         const int bufSize = sizeof(buf);
-        int err = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize, &tmpPw);
+        int err = 0;
+#if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L)
+        tmpPw = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize);
+#else
+        err = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize, &tmpPw);
+#endif
         if (err || !tmpPw)
             return ret;
         const QString homePath = QString::fromLocal8Bit(pw.pw_dir);
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index a33e173..6c03990 100644
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -1362,16 +1362,14 @@ void QPixmapDropShadowFilter::draw(QPainter *p,
     qt_blurImage(&blurPainter, tmp, d->radius, false, true);
     blurPainter.end();
 
-    tmp = blurred;
-
     // blacken the image...
-    tmpPainter.begin(&tmp);
-    tmpPainter.setCompositionMode(QPainter::CompositionMode_SourceIn);
-    tmpPainter.fillRect(tmp.rect(), d->color);
-    tmpPainter.end();
+    QPainter blackenPainter(&blurred);
+    blackenPainter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+    blackenPainter.fillRect(blurred.rect(), d->color);
+    blackenPainter.end();
 
     // draw the blurred drop shadow...
-    p->drawImage(pos, tmp);
+    p->drawImage(pos, blurred);
 
     // Draw the actual pixmap...
     p->drawPixmap(pos, px, src);
diff --git a/src/gui/image/qvolatileimage.cpp b/src/gui/image/qvolatileimage.cpp
index 9734c82..350d70f 100644
--- a/src/gui/image/qvolatileimage.cpp
+++ b/src/gui/image/qvolatileimage.cpp
@@ -248,12 +248,14 @@ void QVolatileImage::copyFrom(QVolatileImage *source, const QRect &rect)
     const uchar *sptr = srcImgRef.constBits() + r.y() * srcbpl;
     beginDataAccess();
     QImage &dstImgRef(imageRef());
-    int dstbpl = dstImgRef.bytesPerLine();
-    uchar *dptr = dstImgRef.bits();
-    for (int y = 0; y < r.height(); ++y) {
-        qMemCopy(dptr, sptr + r.x() * srcbpp, r.width() * srcbpp);
-        sptr += srcbpl;
-        dptr += dstbpl;
+    if (!dstImgRef.isNull()) {
+        int dstbpl = dstImgRef.bytesPerLine();
+        uchar *dptr = dstImgRef.bits();
+        for (int y = 0; y < r.height(); ++y) {
+            qMemCopy(dptr, sptr + r.x() * srcbpp, r.width() * srcbpp);
+            sptr += srcbpl;
+            dptr += dstbpl;
+        }
     }
     endDataAccess();
     source->endDataAccess(true);
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index d0c1a0e..a86cf05 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -2612,6 +2612,9 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
         x += eng->offsetInLigature(si, pos, end, glyph_pos);
     }
 
+    if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width)
+        x = line.width;
+
     *cursorPos = pos + si->position;
     return x.toReal();
 }
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index 4ae1d15..e9e5ca8 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -93,7 +93,7 @@ int QAccessibleMenu::childAt(int x, int y) const
 QString QAccessibleMenu::text(Text t, int child) const
 {
     QString tx = QAccessibleWidgetEx::text(t, child);
-    if (tx.size())
+    if (!child && tx.size())
         return tx;
 
     switch (t) {
diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro
index 74c7fd2..760fbae 100644
--- a/src/plugins/generic/tslib/tslib.pro
+++ b/src/plugins/generic/tslib/tslib.pro
@@ -1,4 +1,4 @@
-TARGET = qlinuxinputplugin
+TARGET = qtslibplugin
 include(../../qpluginbase.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic
diff --git a/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp b/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp
index 4d1d63e..d733cd6 100644
--- a/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp
+++ b/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp
@@ -48,7 +48,7 @@
 
 #include <EGL/egl.h>
 
-QEGLPlatformContext::QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi)
+QEGLPlatformContext::QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi, QEGLPlatformContext *shareContext)
     : QPlatformGLContext()
     , m_eglDisplay(display)
     , m_eglSurface(surface)
@@ -59,7 +59,8 @@ QEGLPlatformContext::QEGLPlatformContext(EGLDisplay display, EGLConfig config, E
     }
 
     eglBindAPI(m_eglApi);
-    m_eglContext = eglCreateContext(m_eglDisplay,config, 0,contextAttrs);
+    EGLContext shareEglContext = shareContext ? shareContext->eglContext() : 0;
+    m_eglContext = eglCreateContext(m_eglDisplay,config, shareEglContext, contextAttrs);
     if (m_eglContext == EGL_NO_CONTEXT) {
         qWarning("Could not create the egl context\n");
         eglTerminate(m_eglDisplay);
diff --git a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h
index 9be1480..614b3cb 100644
--- a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h
+++ b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h
@@ -48,7 +48,7 @@
 class QEGLPlatformContext : public QPlatformGLContext
 {
 public:
-    QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi);
+    QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi, QEGLPlatformContext *shareContext = 0);
     ~QEGLPlatformContext();
 
     void makeCurrent();
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 0a02c7e..ed88138 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -516,7 +516,7 @@ QPlatformGLContext *QXcbWindow::glContext() const
 
         EGLSurface eglSurface = eglCreateWindowSurface(display,config,(EGLNativeWindowType)m_window,0);
         QXcbWindow *that = const_cast<QXcbWindow *>(this);
-        that->m_context = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API);
+        that->m_context = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API, static_cast<QEGLPlatformContext *>(widget()->platformWindowFormat().sharedGLContext()));
 #elif defined(XCB_USE_DRI2)
         QXcbWindow *that = const_cast<QXcbWindow *>(this);
         that->m_context = new QDri2Context(that);
diff --git a/src/plugins/platforms/xlib/qxlibwindow.cpp b/src/plugins/platforms/xlib/qxlibwindow.cpp
index 823fae9..16c5ed5 100644
--- a/src/plugins/platforms/xlib/qxlibwindow.cpp
+++ b/src/plugins/platforms/xlib/qxlibwindow.cpp
@@ -687,7 +687,7 @@ QPlatformGLContext *QXlibWindow::glContext() const
         eglContextAttrs.append(EGL_NONE);
 
         EGLSurface eglSurface = eglCreateWindowSurface(display,config,(EGLNativeWindowType)x_window,0);
-        that->mGLContext = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API);
+        that->mGLContext = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API, static_cast<QEGLPlatformContext *>(windowFormat.sharedGLContext()));
 #endif
 #endif
     }
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index d452820..d24f52f 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -2531,6 +2531,12 @@ void tst_QAccessibility::menuTest()
     QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 4), QString());
     QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 5), QString("Execute"));
 
+    // QTBUG-21578 - after setting accessible name on a menu it would no longer
+    // return the right names for it's children.
+    QCOMPARE(interface->text(QAccessible::Name, 1), QString("New..."));
+    file->setAccessibleName("File");
+    QCOMPARE(interface->text(QAccessible::Name, 1), QString("New..."));
+
     QAccessibleInterface *iface = 0;
     QAccessibleInterface *iface2 = 0;
 
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp
index 859f47f..60fb10c 100644
--- a/tests/auto/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/qglthreads/tst_qglthreads.cpp
@@ -49,6 +49,7 @@
 #include <unistd.h> // for usleep
 #define RUNNING_TIME 2000 // save GPU mem by running shorter time.
 #else
+#include "qplatformdefs.h" // for usleep
 #define RUNNING_TIME 5000
 #endif
 
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp
index 1f52aec..f9ec6ce 100644
--- a/tests/auto/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp
@@ -139,11 +139,6 @@ private slots:
 
 void tst_QObjectRace::moveToThreadRace()
 {
-#if defined(Q_OS_SYMBIAN)
-    // ### FIXME: task 257411 - remove xfail once this is fixed
-    QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race, see task: 257411", Abort);
-    QVERIFY(false);
-#endif
     RaceObject *object = new RaceObject;
 
     enum { ThreadCount = 6 };
@@ -229,13 +224,6 @@ public:
 
 void tst_QObjectRace::destroyRace()
 {
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
-    // ### FIXME: task 257411 - remove xfail once this is fixed.
-	// Oddly enough, this seems to work properly in HW, if given enough time and memory.
-    QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race on emulator, see task: 257411", Abort);
-    QVERIFY(false);
-#endif
-
     enum { ThreadCount = 10, ObjectCountPerThread = 733,
            ObjectCount = ThreadCount * ObjectCountPerThread };
 
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 81f1a3b..665badb 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -1452,6 +1452,8 @@ struct FormBuilderSaveLayoutEntry {
     explicit FormBuilderSaveLayoutEntry(QLayoutItem *li = 0) :
         item(li), row(-1), column(-1), rowSpan(0), columnSpan(0), alignment(0) {}
 
+    void setAlignment(Qt::Alignment al);
+
     QLayoutItem *item;
     int row;
     int column;
@@ -1460,6 +1462,20 @@ struct FormBuilderSaveLayoutEntry {
     Qt::Alignment alignment;
 };
 
+// filter out the case of "Spacer" and "QLayoutWidget" widgets
+void FormBuilderSaveLayoutEntry::setAlignment(Qt::Alignment al)
+{
+    if (!item->widget())
+        return;
+
+    const QString className = item->widget()->metaObject()->className();
+    if (className == QLatin1String("Spacer")
+            || className == QLatin1String("QLayoutWidget"))
+        return;
+
+    alignment = al;
+}
+
 // Create list from standard box layout
 static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout)
 {
@@ -1469,7 +1485,7 @@ static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout
         for (int idx = 0; idx < count; ++idx) {
             QLayoutItem *item = layout->itemAt(idx);
             FormBuilderSaveLayoutEntry entry(item);
-            entry.alignment = item->alignment();
+            entry.setAlignment(item->alignment());
             rc.append(entry);
         }
     }
@@ -1486,7 +1502,7 @@ static QList<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *grid
             QLayoutItem *item = gridLayout->itemAt(idx);
             FormBuilderSaveLayoutEntry entry(item);
             gridLayout->getItemPosition(idx, &entry.row, &entry.column, &entry.rowSpan,&entry.columnSpan);
-            entry.alignment = item->alignment();
+            entry.setAlignment(item->alignment());
             rc.append(entry);
         }
     }