Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

71 files changed, 4245 insertions, 1469 deletions

diff --git a/configure b/configure
index f564aec7e2..f2b645562c 100755
--- a/configure
+++ b/configure
@@ -2411,18 +2411,26 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
     rm -f "$outpath/mkspecs/default"
 
+    ShadowMkspecs()
+    {
+        rm -rf "$outpath/mkspecs/$1"
+        if [ "$UNAME_SYSTEM" = "Linux" ]; then
+            # This works with GNU coreutils, and is needed for ScratchBox
+            cp -rs "$relpath/mkspecs/$1" "$outpath/mkspecs/$1"
+        else
+            # A simple "cp -rs" doesn't work on Mac. :(
+            find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
+            find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
+        fi
+    }
+
     # Special case for mkspecs/features directory.
     # To be able to place .prf files into a shadow build directory,
     # we're creating links for files only. The directory structure is reproduced.
-    rm -rf "$outpath/mkspecs/features"
-    if [ "$UNAME_SYSTEM" = "Linux" ]; then
-        # This works with GNU coreutils, and is needed for ScratchBox
-        cp -rs "$relpath/mkspecs/features" "$outpath/mkspecs/features"
-    else
-        # A simple "cp -rs" doesn't work on Mac. :(
-        find "$relpath/mkspecs/features" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
-        find "$relpath/mkspecs/features" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
-    fi
+    ShadowMkspecs features
+
+    # The modules dir is special, too.
+    ShadowMkspecs modules
 
     # symlink the doc directory
     rm -rf "$outpath/doc"
@@ -6203,9 +6211,13 @@ fi
 
 # find if the platform supports IPv6
 if [ "$CFG_IPV6" != "no" ]; then
-    if [ "$XPLATFORM" = "symbian-sbsv2" ]; then
-        #IPV6 should always be enabled for Symbian release
-        CFG_IPV6=yes
+    #
+    # We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6.
+    # Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt
+    # symbian socket engine.
+    #
+    if echo "$XPLATFORM" | grep symbian > /dev/null; then
+        CFG_IPV6=no
     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
         CFG_IPV6=yes
     else
diff --git a/configure.exe b/configure.exe
index 982e038dc4..18c9004c48 100755
--- a/configure.exe
+++ b/configure.exe
diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp
index 5ceca67e0f..fba781b05d 100644
--- a/demos/browser/settings.cpp
+++ b/demos/browser/settings.cpp
@@ -89,7 +89,7 @@ void SettingsDialog::loadFromSettings()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("http://qt.nokia.com");
+    QString defaultHome = QLatin1String("http://doc.qt.nokia.com");
     homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
     settings.endGroup();
 
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 1d56013a4b..7a491ab6fc 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -15,6 +15,7 @@ INSTALLS = sources target
 
 symbian:{
     TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     qmlminehuntfiles.sources = MinehuntCore minehunt.qml
     DEPLOYMENT = qmlminehuntfiles
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index 0fa23f691d..0c2d8d838e 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -63,10 +63,6 @@
 
     \list
 
-    \o Performing a new install of the Qt 4.6 beta on Snow Leopard
-       triggers a bug in the installer that causes the install to fail.
-       Updating an existing Qt installation works fine.
-
     \o There are two workarounds, either disable spotlight for the target
        drive during the install, or do a custom install where you deselect
        documentation and examples. Run the installer again as a full
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e45892fabc..77856ec720 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -99,7 +99,7 @@
                   <li><a href="linguist-manual.html">Qt Linguist</a></li>
                   <li><a href="assistant-manual.html">Qt Assistant</a></li>
                   <li><a href="qmake-manual.html">Qt qmake</a></li>
-                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li>
+                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/index.html">Qt Simulator</a></li>
                   <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li>
                   <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li>
                   <li><a href="qvfb.html">Virtual Framebuffer</a></li>
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index e7133e383b..db6ff7c530 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -683,4 +683,36 @@
     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.
+	
+    \hr
+
+	jquery 1.4.2.js Copyright 2010 John Resig
+	This software is dual licensed under the MIT or GPL version 2 licenses.
+	Nokia has used the software herein under the MIT license.
+
+	jquery includes Sizzle.js Copyright 2010 The Dojo Foundaton and is
+	licensed under the MIT, BSD and GPL licenses.  Nokia has used this
+	software herein under the MIT license.
+
+	The MIT License
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy
+	of this software and associated documentation files (the "Software"), to deal
+	in the Software without restriction, including without limitation the rights
+	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the Software is
+	furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in
+	all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	THE SOFTWARE.
+	
+	
 */
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
index c6ecd68897..3870e8fa6f 100644
--- a/doc/src/platforms/compiler-notes.qdoc
+++ b/doc/src/platforms/compiler-notes.qdoc
@@ -68,7 +68,7 @@
     \endtable
 
     * WebKit is only supported as a dynamically built library. Static linkage is not supported.
-
+    
     \target GCC
     \section1 GCC
 
@@ -115,6 +115,7 @@
     \section2 Solaris
 
     Please use GCC 3.4.2 or later.
+	Please not that WebKit is not supported for Solaris, regardless of which compiler is used.
 
     \section2 Mac OS X
 
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index bb80ae5d14..6e9fb3d109 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -64,18 +64,22 @@
     \row    \o Linux (32 and 64-bit)
                                      \o gcc 4.2
     \row    \o Microsoft Windows XP
-                                     \o gcc 4.4 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit)
+                                     \o gcc 4.4 (MinGW) (32-bit), MSVC 2005 (32 and 64-bit)
     \row    \o Microsoft Windows Vista
                                      \o MSVC 2005, 2008
     \row    \o Microsoft Windows Vista 64bit
                                      \o MSVC 2008
-    \row    \o Apple Mac OS X 10.5 "Leopard" x86_64 (Carbon, Cocoa 32 and 64bit)
+    \row    \o Microsoft Windows 7
+                                     \o MSVC 2008
+    \row    \o Apple Mac OS X 10.6 "Snow Leopard" 
+                                     \o As provided by Apple
+    \row    \o Apple Mac OS X 10.5 "Leopard" x86_64 (Cocoa 32 and 64bit)
                                      \o As provided by Apple
     \row    \o Embedded Linux QWS (ARM)
                                      \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
     \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
-    \row    \o Symbian (Symbian/S60 3.1, 3.2 and 5.0)
+    \row    \o Symbian (Symbian/S60 5.0)
                                      \o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
     \endtable
 
@@ -90,19 +94,15 @@
     \table
     \header \o Platform
                                      \o Compilers
-    \row    \o Windows XP, Vista
-                                     \o gcc 3.4.2 (MinGW)
     \row    \o Windows 7
-                                     \o MSVC 2008
-    \row    \o Apple Mac OS X 10.6 "Snow Leopard"
+                                     \o MSVC 2010
+    \row    \o Apple Mac OS X 10.4 "Tiger" (Carbon)
                                      \o As provided by Apple
-    \row    \o Apple Mac OS X 10.4 "Tiger"
+    \row    \o Apple Mac OS X 10.5 "Leopard" (Carbon)
                                      \o As provided by Apple
-    \row    \o HPUXi 11.11
-                                     \o aCC 3.57, gcc 3.4
     \row    \o HPUXi 11.23
                                      \o aCC 6.10
-    \row    \o Solaris 10 (UltraSparc, x86)
+    \row    \o Solaris 10 UltraSparc
                                      \o Sun Studio 12
     \row    \o AIX 6
                                      \o Power5 xlC 7
@@ -114,8 +114,14 @@
                                      \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
     \row    \o Embedded Linux X11 (ARM)
                                      \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
+    \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
+                                     \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
     \row    \o Windows CE 6.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2008 WinCE 6.0 Professional
+    \row    \o Maemo 5(Linux, ARM, X11)
+                                     \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
+    \row    \o Symbian (Symbian/S60 3.1, 3.2)
+                                     \o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
     \endtable
 
     \section1 Tier 3 Platforms (Not supported by Nokia)
@@ -142,20 +148,12 @@
     implied warranties of merchantability, fitness for a particular purpose, title and
     non-infringement with regard to the Licensed Software.
     
-    \section1 Planned Changes for Qt 4.7
+    \section1 Planned Changes for Qt 4.8
 
     The following changes to the list of supported platforms are at time of publishing
-    planned for Qt 4.7:
+    planned for Qt 4.8:
 
     \list
-    \o Upgrade Windows 7 to Tier 1
-    \o Upgrade Mac OS X 10.6 to Tier 1
-    \o Add support for Visual Studio 2010 (Tier 2)
-    \o Move support for Carbon implementation of Qt on Mac OS X from Tier 1 to Tier 2
-    \o Drop support for MinGW 3.4
-    \o Drop support for Visual Studio 2003
-    \o Drop support for HP-UX on PA-RISC
-    \o Drop support for Windows Mobile 5
-    \o Drop support for OpenGL ES Common Lite 1.0
+    \o Plans not yet released
     \endlist
 */
diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h
index 47b026efe1..87c3dba5f8 100755
--- a/examples/tutorials/modelview/3_changingmodel/mymodel.h
+++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h
@@ -42,8 +42,7 @@
 #define MYMODEL_H
 
 #include <QAbstractTableModel>
-
-class QTimer;  // forward declaration
+#include <QTimer>
 
 class MyModel : public QAbstractTableModel
 {
diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h
index 1d49f47711..ac5b77b10d 100755
--- a/examples/tutorials/modelview/5_edit/mainwindow.h
+++ b/examples/tutorials/modelview/5_edit/mainwindow.h
@@ -42,8 +42,7 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-
-class QTableView; //forward declaration
+#include <QtGui/QTableView>
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h
index fb8de799ed..4c4ddb0bf3 100755
--- a/examples/tutorials/modelview/6_treeview/mainwindow.h
+++ b/examples/tutorials/modelview/6_treeview/mainwindow.h
@@ -42,10 +42,8 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-
-class QTreeView; //forward declaration
-class QStandardItemModel;
-class QStandardItem;
+#include <QtGui/QTreeView>
+#include <QtGui/QStandardItemModel>
 
 
 class MainWindow : public QMainWindow
diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h
index f2defb54c4..a8f8488175 100755
--- a/examples/tutorials/modelview/7_selections/mainwindow.h
+++ b/examples/tutorials/modelview/7_selections/mainwindow.h
@@ -42,10 +42,8 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-
-class QTreeView; //forward declaration
-class QStandardItemModel;
-class QItemSelection;
+#include <QtGui/QTreeView>
+#include <QtGui/QStandardItemModel>
 
 
 class MainWindow : public QMainWindow
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf
index 4230ad7ae8..52927816c6 100644
--- a/mkspecs/common/symbian/symbian-mmp.conf
+++ b/mkspecs/common/symbian/symbian-mmp.conf
@@ -55,3 +55,15 @@ symbian {
         }
     }
 }
+
+# Variables for replacing equivalent QMAKE_* variables in bld.inf for FLM execution of commands
+symbian-sbsv2 {
+    QMAKE_SBSV2_COPY           = $(GNUCP)
+    QMAKE_SBSV2_COPY_DIR       = $(GNUCP) -r
+    QMAKE_SBSV2_MOVE           = $(GNUMV)
+    QMAKE_SBSV2_DEL_FILE       = $(GNURM) -f
+    QMAKE_SBSV2_MKDIR          = $(GNUMKDIR)
+    QMAKE_SBSV2_DEL_DIR        = $(GNURMDIR)
+    QMAKE_SBSV2_DEL_TREE       = $(GNURM) -rf
+}
+
diff --git a/mkspecs/features/win32/msvc_mp.prf b/mkspecs/features/win32/msvc_mp.prf
new file mode 100644
index 0000000000..d6dea14db9
--- /dev/null
+++ b/mkspecs/features/win32/msvc_mp.prf
@@ -0,0 +1,2 @@
+QMAKE_CFLAGS += $$QMAKE_CFLAGS_MP
+QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_MP
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 9805e906b4..9a69aaa497 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -23,6 +23,7 @@ QMAKE_CFLAGS_RELEASE    = -O2 -MD
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
+QMAKE_CFLAGS_MP         = -MP
 
 QMAKE_CXX               = $$QMAKE_CC
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
@@ -32,6 +33,7 @@ QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
 QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_LTCG     = $$QMAKE_CFLAGS_LTCG
+QMAKE_CXXFLAGS_MP       = $$QMAKE_CFLAGS_MP
 QMAKE_CXXFLAGS_STL_ON   = -EHsc
 QMAKE_CXXFLAGS_STL_OFF  =
 QMAKE_CXXFLAGS_RTTI_ON  = -GR
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 28d4d3cc41..8331c142fe 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -23,6 +23,7 @@ QMAKE_CFLAGS_RELEASE    = -O2 -MD
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
+QMAKE_CFLAGS_MP         = -MP
 
 QMAKE_CXX               = $$QMAKE_CC
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
@@ -32,6 +33,7 @@ QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
 QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_LTCG     = $$QMAKE_CFLAGS_LTCG
+QMAKE_CXXFLAGS_MP       = $$QMAKE_CFLAGS_MP
 QMAKE_CXXFLAGS_STL_ON   = -EHsc
 QMAKE_CXXFLAGS_STL_OFF  =
 QMAKE_CXXFLAGS_RTTI_ON  = -GR
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index b58757cb3e..354a73f703 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -23,11 +23,14 @@ LINK	    = link
 # specific stuff for VS2005
 #
 !if "$(QMAKESPEC)" == "win32-msvc2005"
-CFLAGS      = /Zc:wchar_t-
+CFLAGS_EXTRA      = /Zc:wchar_t-
+!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010"
+CFLAGS_EXTRA      = /MP
 !endif
 
-CFLAGS	     = -c -Fo$@ \
+CFLAGS_BARE = -c -Fo./ \
               -W3 -nologo -O2 \
+              $(CFLAGS_EXTRA) \
               -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
               -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
@@ -37,38 +40,19 @@ CFLAGS	     = -c -Fo$@ \
               -I$(SOURCE_PATH)\tools\shared \
               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
               -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
-              -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED \
-              $(CFLAGS)
-CXXFLAGS    = $(CFLAGS)
+              -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED
+CFLAGS   = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS)
+
+CXXFLAGS_BARE = $(CFLAGS_BARE)
+CXXFLAGS = $(CFLAGS)
+
 LFLAGS	    =
 LIBS	    = ole32.lib advapi32.lib
 LINKQMAKE   = $(LINK) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
 ADDCLEAN    = vc60.pdb vc70.pdb qmake.pdb qmake.ilk
-!ELSE
 
-#
-# specific stuff for Borland make
-#
-!if !$d(BCB)
-BCB = $(MAKEDIR)\..
-!endif
-CXX	    = bcc32
-CFLAGS	    = -c -o$@ \
-	-tWR -w -w-hid -w-use -O1 \
-	-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
-	-I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
-	-I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
-	-I$(BUILD_PATH)\src\corelib\global \
-        -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
-    -I$(SOURCE_PATH)\tools\shared \
-	-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
-	-DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
-	-DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT
-CXXFLAGS    = $(CFLAGS)
-LFLAGS	    = -L$(BCB)\lib -c -x -Gn -ap -Tpe c0x32.obj
-LIBS	    = import32.lib cw32i.lib
-LINKQMAKE   = ilink32 $(LFLAGS) $(OBJS) $(QTOBJS), qmake.exe,,$(LIBS)
-ADDCLEAN    = qmake.tds
+!ELSE
+!ERROR Unsupported compiler for this Makefile
 !ENDIF
 
 #qmake code
@@ -133,81 +117,14 @@ QTOBJS= \
 first all: qmake.exe
 
 qmake.exe: $(OBJS) $(QTOBJS)
-	$(LINKQMAKE)
+	$(LINKQMAKE) qmake_pch.obj
 	-copy qmake.exe $(BUILD_PATH)\bin\qmake.exe
 
 clean::
-	-del qbitarray.obj
-	-del qbuffer.obj
-	-del qcryptographichash.obj
-	-del qlinkedlist.obj
-	-del qfsfileengine.obj
-	-del qfsfileengine_iterator.obj
-	-del qbytearray.obj
-	-del qvsnprintf.obj
-	-del qbytearraymatcher.obj
-	-del qdatetime.obj
-	-del qdir.obj
-	-del qdiriterator.obj
-	-del qfile.obj
-	-del qtemporaryfile.obj
-	-del qabstractfileengine.obj
-	-del qfsfileengine_win.obj
-	-del qfsfileengine_iterator_win.obj
-	-del qfileinfo.obj
-	-del qglobal.obj
-	-del qhash.obj
-	-del qiodevice.obj
-	-del qlist.obj
-	-del qlocale.obj
-	-del qmalloc.obj
-	-del qmap.obj
-	-del qregexp.obj
-	-del qtextcodec.obj
-	-del qutfcodec.obj
-	-del qstring.obj
-	-del qstringlist.obj
-	-del qtextstream.obj
-	-del qdatastream.obj
-	-del quuid.obj
-	-del qvector.obj
-	-del qsettings.obj
-	-del qlibraryinfo.obj
-	-del qvariant.obj
-	-del qurl.obj
-	-del qsettings_win.obj
-	-del qmetatype.obj
-	-del project.obj
-	-del main.obj
-	-del makefile.obj
-	-del unixmake.obj
-	-del unixmake2.obj
-	-del mingw_make.obj
-	-del option.obj
-	-del winmakefile.obj
-	-del projectgenerator.obj
-	-del property.obj
-	-del meta.obj
-	-del makefiledeps.obj
-	-del metamakefile.obj
-	-del xmloutput.obj
-	-del borland_bmake.obj
-	-del msvc_nmake.obj
-	-del msvc_vcproj.obj
-	-del msvc_vcxproj.obj
-	-del msvc_objectmodel.obj
-	-del msbuild_objectmodel.obj
-	-del symmake.obj
-	-del symmake_abld.obj
-	-del symmake_sbsv2.obj
-	-del symbiancommon.obj
-	-del initprojectdeploy_symbian.obj
-	-del registry.obj
-	-del epocroot.obj
-	-del pbuilder_pbx.obj
-	-del qxmlstream.obj
-	-del qxmlutils.obj
-	-del qnumeric.obj
+	-del $(QTOBJS)
+	-del $(OBJS)
+	-del qmake_pch.obj
+	-del qmake_pch.pch
 	-del vc60.pdb
 	-del vc70.pdb
 	-del qmake.pdb
@@ -229,227 +146,57 @@ distclean:: clean
 .cxx.obj:
 	$(CXX) $(CXXFLAGS) $<
 
-qsettings_win.obj: $(SOURCE_PATH)\src\corelib\io\qsettings_win.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qsettings_win.cpp
-
-qsettings.obj: $(SOURCE_PATH)\src\corelib\io\qsettings.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qsettings.cpp
-
-qlibraryinfo.obj: $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp
-
-qnumeric.obj: $(SOURCE_PATH)\src\corelib\global\qnumeric.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qnumeric.cpp
-
-qvariant.obj: $(SOURCE_PATH)\src\corelib\kernel\qvariant.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\kernel\qvariant.cpp
-
-qurl.obj: $(SOURCE_PATH)\src\corelib\io\qurl.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qurl.cpp
-
-qtextstream.obj: $(SOURCE_PATH)\src\corelib\io\qtextstream.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qtextstream.cpp
-
-qdatastream.obj: $(SOURCE_PATH)\src\corelib\io\qdatastream.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdatastream.cpp
-
-qiodevice.obj: $(SOURCE_PATH)\src\corelib\io\qiodevice.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qiodevice.cpp
-
-qmalloc.obj: $(SOURCE_PATH)\src\corelib\global\qmalloc.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qmalloc.cpp
-
-qglobal.obj: $(SOURCE_PATH)\src\corelib\global\qglobal.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qglobal.cpp
-
-qhash.obj: $(SOURCE_PATH)\src\corelib\tools\qhash.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qhash.cpp
-
-qbytearray.obj: $(SOURCE_PATH)\src\corelib\tools\qbytearray.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbytearray.cpp
-
-qcryptographichash.obj: $(SOURCE_PATH)\src\corelib\tools\qcryptographichash.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qcryptographichash.cpp
-
-qvsnprintf.obj: $(SOURCE_PATH)\src\corelib\tools\qvsnprintf.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qvsnprintf.cpp
-
-qbytearraymatcher.obj: $(SOURCE_PATH)\src\corelib\tools\qbytearraymatcher.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbytearraymatcher.cpp
-
-qchar.obj: $(SOURCE_PATH)\src\corelib\tools\qchar.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qchar.cpp
-
-qutfcodec.obj: $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp
-
-qstring.obj: $(SOURCE_PATH)\src\corelib\tools\qstring.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstring.cpp
-
-qstringmatcher.obj: $(SOURCE_PATH)\src\corelib\tools\qstringmatcher.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstringmatcher.cpp
-
-qlocale.obj: $(SOURCE_PATH)\src\corelib\tools\qlocale.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlocale.cpp
-
-quuid.obj: $(SOURCE_PATH)\src\corelib\plugin\quuid.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\plugin\quuid.cpp
-
-qbuffer.obj: $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp
-
-qlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlist.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlist.cpp
-
-qlinkedlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp
-
-qfile.obj: $(SOURCE_PATH)\src\corelib\io\qfile.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfile.cpp
-
-qtemporaryfile.obj: $(SOURCE_PATH)\src\corelib\io\qtemporaryfile.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qtemporaryfile.cpp
-
-qfsfileengine_win.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_win.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_win.cpp
-
-qfsfileengine_iterator_win.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator_win.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator_win.cpp
-
-qfsfileengine.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine.cpp
-
-qfsfileengine_iterator.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator.cpp
-
-qabstractfileengine.obj: $(SOURCE_PATH)\src\corelib\io\qabstractfileengine.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qabstractfileengine.cpp
-
-qtextcodec.obj: $(SOURCE_PATH)\src\corelib\codecs\qtextcodec.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\codecs\qtextcodec.cpp
-
-qregexp.obj: $(SOURCE_PATH)\src\corelib\tools\qregexp.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qregexp.cpp
+$(OBJS): qmake_pch.obj
 
-qvector.obj: $(SOURCE_PATH)\src\corelib\tools\qvector.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qvector.cpp
+$(QTOBJS): qmake_pch.obj
 
-qbitarray.obj: $(SOURCE_PATH)\src\corelib\tools\qbitarray.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbitarray.cpp
+qmake_pch.obj:
+	$(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP qmake_pch.h
 
-qdir.obj: $(SOURCE_PATH)\src\corelib\io\qdir.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdir.cpp
-
-qdiriterator.obj: $(SOURCE_PATH)\src\corelib\io\qdiriterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdiriterator.cpp
-
-qmetatype.obj: $(SOURCE_PATH)\src\corelib\kernel\qmetatype.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\kernel\qmetatype.cpp
-
-qfileinfo.obj: $(SOURCE_PATH)\src\corelib\io\qfileinfo.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfileinfo.cpp
-
-qdatetime.obj: $(SOURCE_PATH)\src\corelib\tools\qdatetime.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qdatetime.cpp
-
-qstringlist.obj: $(SOURCE_PATH)\src\corelib\tools\qstringlist.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstringlist.cpp
-
-qmap.obj: $(SOURCE_PATH)\src\corelib\tools\qmap.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qmap.cpp
-
-qunicodetables.obj: $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
-
-makefile.obj: $(SOURCE_PATH)/qmake/generators\makefile.cpp
-	$(CXX) $(CXXFLAGS) generators\makefile.cpp
-
-unixmake.obj: $(SOURCE_PATH)/qmake/generators\unix\unixmake.cpp
-	$(CXX) $(CXXFLAGS) generators\unix\unixmake.cpp
-
-unixmake2.obj: $(SOURCE_PATH)/qmake/generators\unix\unixmake2.cpp
-	$(CXX) $(CXXFLAGS) generators\unix\unixmake2.cpp
-
-winmakefile.obj: $(SOURCE_PATH)/qmake/generators/win32/winmakefile.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp
-
-borland_bmake.obj: $(SOURCE_PATH)/qmake/generators/win32/borland_bmake.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp
-
-mingw_make.obj: $(SOURCE_PATH)/qmake/generators/win32/mingw_make.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp
-
-msvc_nmake.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_nmake.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp
-
-msvc_vcproj.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
-
-msvc_vcxproj.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcxproj.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/msvc_vcxproj.cpp
-
-msvc_objectmodel.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
-
-msbuild_objectmodel.obj: $(SOURCE_PATH)/qmake/generators/win32/msbuild_objectmodel.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/msbuild_objectmodel.cpp
-
-symmake.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
-	$(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
-
-symmake_abld.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
-	$(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
-
-symmake_sbsv2.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
-	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
-
-symbiancommon.obj: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp
-	$(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp
-
-initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
-	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+{$(SOURCE_PATH)\qmake\generators\mac}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-registry.obj: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+{$(SOURCE_PATH)\qmake\generators\symbian}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-epocroot.obj: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
+{$(SOURCE_PATH)\qmake\generators\unix}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
+{$(SOURCE_PATH)\qmake\generators\win32}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-project.obj: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
-	$(CXX) $(CXXFLAGS) project.cpp
+{$(SOURCE_PATH)\qmake\generators}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-meta.obj: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
-	$(CXX) $(CXXFLAGS) meta.cpp
+{$(SOURCE_PATH)\qmake}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-main.obj: $(SOURCE_PATH)/qmake/main.cpp $(SOURCE_PATH)/qmake/project.h
-	$(CXX) $(CXXFLAGS) main.cpp
+{$(SOURCE_PATH)\src\3rdparty\md5}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-option.obj: $(SOURCE_PATH)/qmake/option.cpp $(SOURCE_PATH)/qmake/option.h
-	$(CXX) $(CXXFLAGS) option.cpp
+{$(SOURCE_PATH)\src\corelib\codecs}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-property.obj: $(SOURCE_PATH)/qmake/property.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
-	$(CXX) $(CXXFLAGS) property.cpp
+{$(SOURCE_PATH)\src\corelib\global}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-projectgenerator.obj: $(SOURCE_PATH)/qmake/generators/projectgenerator.cpp
-	$(CXX) $(CXXFLAGS) generators/projectgenerator.cpp
+{$(SOURCE_PATH)\src\corelib\io}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-pbuilder_pbx.obj: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp
-	$(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
+{$(SOURCE_PATH)\src\corelib\kernel}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-makefiledeps.obj: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp
-	$(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
+{$(SOURCE_PATH)\src\corelib\plugin}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
-	$(CXX) $(CXXFLAGS) generators/metamakefile.cpp
+{$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-xmloutput.obj: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
-	$(CXX) $(CXXFLAGS) generators/xmloutput.cpp
+{$(SOURCE_PATH)\src\corelib\xml}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-qxmlstream.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
+{$(SOURCE_PATH)\tools\shared\symbian}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
 
-qxmlutils.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp
+{$(SOURCE_PATH)\tools\shared\windows}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index e794351c31..c66c1b8ca0 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -413,6 +413,28 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
         }
     }
 
+    QMap<QString, QString> commandsToReplace;
+    commandsToReplace.insert(project->values("QMAKE_COPY").join(" "),
+                             project->values("QMAKE_SBSV2_COPY").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_COPY_DIR").join(" "),
+                             project->values("QMAKE_SBSV2_COPY_DIR").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_MOVE").join(" "),
+                             project->values("QMAKE_SBSV2_MOVE").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_DEL_FILE").join(" "),
+                             project->values("QMAKE_SBSV2_DEL_FILE").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_MKDIR").join(" "),
+                             project->values("QMAKE_SBSV2_MKDIR").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_DEL_DIR").join(" "),
+                             project->values("QMAKE_SBSV2_DEL_DIR").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_DEL_TREE").join(" "),
+                             project->values("QMAKE_SBSV2_DEL_TREE").join(" "));
+
+    // If commandItem starts with any $$QMAKE_* commands, do a replace for SBS equivalent
+    // Command replacement is done only for the start of the command or right after
+    // concatenation operators (&& and ||), as otherwise unwanted replacements might occur.
+    static QString cmdFind("(^|&&\\s*|\\|\\|\\s*)%1");
+    static QString cmdReplace("\\1%1");
+
     // Write extra compilers and targets to initialize QMAKE_ET_* variables
     // Cache results to avoid duplicate calls when creating wrapper makefile
     QTextStream extraCompilerStream(&extraCompilersCache);
@@ -424,13 +446,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     // are not necessary.
     QStringList allPreDeps;
     foreach(QString item, project->values("PRE_TARGETDEPS")) {
-        // Predeps get mangled in windows, so fix them to more sbsv2 friendly format
-#if defined(Q_OS_WIN)
-        if (item.mid(1, 1) == ":")
-            item = item.mid(0, 1).toUpper().append(item.mid(1)); // Fix drive to uppercase
-#endif
-        item.replace("\\", "/");
-        allPreDeps << escapeDependencyPath(item);
+        allPreDeps.append(fileInfo(item).absoluteFilePath());
     }
 
     foreach (QString item, project->values("GENERATED_SOURCES")) {
@@ -460,7 +476,6 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
                 QStringList deps = project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + item + targetItem);
                 QString commandItem =  project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + item + targetItem).join(" ");
 
-
                 // Make sure all deps paths are absolute
                 QString absoluteDeps;
                 foreach (QString depItem, deps) {
@@ -474,6 +489,18 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
                 t << "OPTION PREDEP_TARGET " << absoluteTarget << endl;
                 t << "OPTION DEPS " << absoluteDeps << endl;
 
+                // Iterate command replacements in reverse alphabetical order of keys so
+                // that keys which are starts of other longer keys are iterated after longer keys.
+                QMapIterator<QString, QString> cmdIter(commandsToReplace);
+                cmdIter.toBack();
+                while (cmdIter.hasPrevious()) {
+                    cmdIter.previous();
+                    if (commandItem.contains(cmdIter.key())) {
+                        commandItem.replace(QRegExp(cmdFind.arg(cmdIter.key())),
+                                            cmdReplace.arg(cmdIter.value()));
+                    }
+                }
+
                 if (commandItem.indexOf("$(INCPATH)") != -1)
                     commandItem.replace("$(INCPATH)", incPath.join(" "));
                 if (commandItem.indexOf("$(DEFINES)") != -1)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
index 93431dfa85..fbaf5d2798 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
@@ -1,3 +1,39 @@
+2010-06-18  Tucker Jay  <jay.tucker@nokia.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        [Symbian] Lazy commit of memory required in JSC register file
+        https://bugs.webkit.org/show_bug.cgi?id=34349
+
+        * JavaScriptCore.pro: Added 1 new Symbian source file
+        * interpreter/RegisterFile.cpp:
+        (JSC::RegisterFile::~RegisterFile):
+        * interpreter/RegisterFile.h:
+        (JSC::RegisterFile::):
+        (JSC::RegisterFile::start):
+        (JSC::RegisterFile::end):
+        (JSC::RegisterFile::size):
+        (JSC::RegisterFile::setNumGlobals):
+        (JSC::RegisterFile::numGlobals):
+        (JSC::RegisterFile::maxGlobals):
+        (JSC::RegisterFile::lastGlobal):
+        (JSC::RegisterFile::markGlobals):
+        (JSC::RegisterFile::markCallFrames):
+        (JSC::isPageAligned):
+        (JSC::RegisterFile::RegisterFile):
+        (JSC::RegisterFile::shrink):
+        (JSC::RegisterFile::grow):
+        * wtf/symbian/RegisterFileAllocatorSymbian.cpp: Added.
+        (WTF::RegisterFileAllocator::RegisterFileAllocator):
+        Helper class to allocate memory required by RegisterFile
+        more efficiently.
+        (WTF::RegisterFileAllocator::~RegisterFileAllocator):
+        (WTF::RegisterFileAllocator::buffer):
+        (WTF::RegisterFileAllocator::grow):
+        (WTF::RegisterFileAllocator::shrink):
+        * wtf/symbian/RegisterFileAllocatorSymbian.h: Added.
+        * wtf/symbian/SymbianDefines.h: Added.
+
 2010-06-19  Thiago Macieira <thiago.macieira@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
index 75737aed66..d75bd31198 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
@@ -211,6 +211,7 @@ SOURCES += \
     wtf/qt/ThreadingQt.cpp \
     wtf/RandomNumber.cpp \
     wtf/RefCountedLeakCounter.cpp \
+    wtf/symbian/RegisterFileAllocatorSymbian.cpp \
     wtf/ThreadingNone.cpp \
     wtf/Threading.cpp \
     wtf/TypeTraits.cpp \
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.cpp
index 939573b404..293fc385eb 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.cpp
@@ -40,6 +40,8 @@ RegisterFile::~RegisterFile()
     VirtualFree(m_buffer, DWORD(m_commitEnd) - DWORD(m_buffer), MEM_DECOMMIT);
 #endif
     VirtualFree(m_buffer, 0, MEM_RELEASE);
+#elif OS(SYMBIAN)
+    delete m_registerFileAllocator;
 #else
     fastFree(m_buffer);
 #endif
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.h b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.h
index 34e25042e0..49304d9b60 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.h
@@ -41,6 +41,10 @@
 #include <sys/mman.h>
 #endif
 
+#if OS(SYMBIAN)
+#include <wtf/symbian/RegisterFileAllocatorSymbian.h>
+#endif
+
 namespace JSC {
 
 /*
@@ -152,12 +156,21 @@ namespace JSC {
 #if HAVE(VIRTUALALLOC)
         Register* m_commitEnd;
 #endif
+#if OS(SYMBIAN)
+        // Commits and frees a continguous chunk of memory as required
+        WTF::RegisterFileAllocator* m_registerFileAllocator;
+#endif
 
         JSGlobalObject* m_globalObject; // The global object whose vars are currently stored in the register file.
     };
 
     // FIXME: Add a generic getpagesize() to WTF, then move this function to WTF as well.
-    inline bool isPageAligned(size_t size) { return size != 0 && size % (8 * 1024) == 0; }
+    // This is still a hack that should be fixed later. We know that a Symbian page size is 4K.
+    #if OS(SYMBIAN)
+    inline bool isPageAligned(size_t size) { return size && !(size % (4 * 1024)); }
+    #else
+    inline bool isPageAligned(size_t size) { return size && !(size % (8 * 1024)); }
+    #endif
 
     inline RegisterFile::RegisterFile(size_t capacity, size_t maxGlobals)
         : m_numGlobals(0)
@@ -204,7 +217,13 @@ namespace JSC {
             CRASH();
         }
         m_commitEnd = reinterpret_cast<Register*>(reinterpret_cast<char*>(m_buffer) + committedSize);
-    #else 
+    #elif OS(SYMBIAN)
+        m_registerFileAllocator = new WTF::RegisterFileAllocator(bufferLength);
+        m_buffer = (Register*)(m_registerFileAllocator->buffer());
+        // start by committing enough space to hold maxGlobals
+        void* newEnd = (void*)((int)m_buffer + (maxGlobals * sizeof(Register)));
+        m_registerFileAllocator->grow(newEnd);
+    #else
         /* 
          * If neither MMAP nor VIRTUALALLOC are available - use fastMalloc instead.
          *
@@ -226,8 +245,13 @@ namespace JSC {
         if (newEnd >= m_end)
             return;
         m_end = newEnd;
-        if (m_end == m_start && (m_maxUsed - m_start) > maxExcessCapacity)
+        if (m_end == m_start && (m_maxUsed - m_start) > maxExcessCapacity) {
+#if OS(SYMBIAN)
+            m_registerFileAllocator->shrink(newEnd);
+#endif
+
             releaseExcessCapacity();
+        }
     }
 
     inline bool RegisterFile::grow(Register* newEnd)
@@ -252,6 +276,9 @@ namespace JSC {
             m_commitEnd = reinterpret_cast<Register*>(reinterpret_cast<char*>(m_commitEnd) + size);
         }
 #endif
+#if OS(SYMBIAN)
+        m_registerFileAllocator->grow((void*)newEnd);
+#endif
 
         if (newEnd > m_maxUsed)
             m_maxUsed = newEnd;
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp
new file mode 100644
index 0000000000..baa7841a2d
--- /dev/null
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * 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.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
+ */
+
+#include "config.h"
+
+#if OS(SYMBIAN)
+
+#include "RegisterFileAllocatorSymbian.h"
+
+namespace WTF {
+
+/** Efficiently allocates memory pools of size poolSize.
+ * Primarily designed for JSC RegisterFile's needs.
+ * Not thread-safe.
+ */
+RegisterFileAllocator::RegisterFileAllocator(TUint32 reservationSize, TUint32 poolSize) :
+    m_reserved(reservationSize), m_poolSize(poolSize)
+{
+    // Get system's page size value.
+    SYMBIAN_PAGESIZE(m_pageSize);
+
+    // We only accept multiples of system page size for both initial reservation
+    // and the alignment/pool size
+    m_reserved = SYMBIAN_ROUNDUPTOMULTIPLE(m_reserved, m_pageSize);
+    __ASSERT_ALWAYS(SYMBIAN_ROUNDUPTOMULTIPLE(m_poolSize, m_pageSize),
+                    User::Panic(_L("RegisterFileAllocator1"), KErrArgument));
+
+    // Open a Symbian RChunk, and reserve requested virtual address range
+    // Any thread in this process can operate this RChunk due to EOwnerProcess access rights.
+    TInt ret = m_chunk.CreateDisconnectedLocal(0 , 0, (TInt)m_reserved , EOwnerProcess);
+    if (ret != KErrNone)
+        User::Panic(_L("RegisterFileAllocator2"), ret);
+
+    m_buffer = (void*)m_chunk.Base();
+    m_resEnd = (void*)(m_chunk.Base() + m_chunk.MaxSize());
+    m_comEnd = m_buffer;
+}
+
+RegisterFileAllocator::~RegisterFileAllocator()
+{
+    // release everything!
+    m_chunk.Decommit(0, m_chunk.MaxSize());
+    m_chunk.Close();
+}
+
+void* RegisterFileAllocator::buffer() const
+{
+    return m_buffer;
+}
+
+void RegisterFileAllocator::grow(void* newEnd)
+{
+    // trying to commit more memory than reserved!
+    if (newEnd > m_resEnd)
+        return;
+
+    if (newEnd > m_comEnd) {
+        TInt nBytes = (TInt)(newEnd) - (TInt)(m_comEnd);
+        nBytes = SYMBIAN_ROUNDUPTOMULTIPLE(nBytes, m_poolSize);
+        TInt offset = (TInt)m_comEnd - (TInt)m_buffer;
+
+        TInt ret = m_chunk.Commit(offset, nBytes);
+        if (ret == KErrNone)
+            m_comEnd = (void*)(m_chunk.Base() + m_chunk.Size());
+    }
+}
+
+void RegisterFileAllocator::shrink(void* newEnd)
+{
+    if (newEnd < m_comEnd) {
+        TInt nBytes = (TInt)newEnd - (TInt)m_comEnd;
+        if (nBytes >= m_poolSize) {
+            TInt offset = SYMBIAN_ROUNDUPTOMULTIPLE((TUint)newEnd, m_poolSize) - (TInt)m_buffer;
+            nBytes = (TInt)m_comEnd - offset - (TInt)m_buffer;
+            if (nBytes > 0) {
+                TInt ret = m_chunk.Decommit(offset, nBytes);
+                if (ret == KErrNone)
+                    m_comEnd = (void*)(m_chunk.Base() + m_chunk.Size());
+            }
+        }
+    }
+}
+
+} // end of namespace
+
+#endif // SYMBIAN
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h
new file mode 100644
index 0000000000..4cfc8c5de6
--- /dev/null
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * 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.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 RegisterFileAllocatorSymbian_h
+#define RegisterFileAllocatorSymbian_h
+
+#include "SymbianDefines.h"
+
+namespace WTF {
+
+/**
+ *  Allocates contiguous regions of size poolSize.
+ *  poolSize must be a multiple of system page size (typically 4K on Symbian/ARM)
+ *
+ *  @param reservationSize Virtual address range to be reserved upon creation of chunk (bytes).
+ *  @param poolSize Size of a single allocation.
+ */
+class RegisterFileAllocator {
+
+public:
+    RegisterFileAllocator(
+            TUint32 reservationSize, TUint32 poolSize = SYMBIAN_REGFILEALLOC_DEFAULTPOOLSIZE);
+    ~RegisterFileAllocator();
+    void* buffer() const;
+    void grow(void* newEnd);
+    void shrink(void* newEnd);
+
+private:
+    RChunk   m_chunk; // Symbian chunk that lets us reserve/commit/decommit
+
+    // all following values are in numbers of bytes
+    TInt     m_pageSize; // cached value of system page size, typically 4K on Symbian
+    TUint32  m_reserved; // total number of reserved bytes in virtual memory
+    TUint32  m_poolSize; // size of one memory pool, set by default to 64K in wtf/symbian/SymbianDefines.h
+
+    void* m_buffer; // pointer to base of the chunk
+    void* m_comEnd; // pointer to end of currently committed memory
+    void* m_resEnd; // pointer to end of reserved memory
+
+};
+
+} // end of namespace
+
+#endif // RegisterFileAllocatorSymbian_h
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h
new file mode 100644
index 0000000000..43e22b389a
--- /dev/null
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * 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.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 SymbianDefines_h
+#define SymbianDefines_h
+
+#include <e32cmn.h>
+#include <e32std.h>
+#include <hal.h>
+
+#define SYMBIAN_PAGESIZE(x) (HAL::Get(HALData::EMemoryPageSize, x));
+#define SYMBIAN_FREERAM(x)  (HAL::Get(HALData::EMemoryRAMFree, x));
+#define SYMBIAN_ROUNDUPTOMULTIPLE(x, multipleof) ( (x + multipleof - 1) & ~(multipleof - 1) )
+
+#define SYMBIAN_REGFILEALLOC_DEFAULTPOOLSIZE 65536 // 64K
+
+#endif // SymbianDefines_h
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 537cdd39df..5ea1e778a2 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -2857,13 +2857,13 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
     }
 }
 
-!symbian {
+!symbian-abld:!symbian-sbsv2 {
     modfile.files = $$moduleFile
     modfile.path = $$[QMAKE_MKSPECS]/modules
 
     INSTALLS += modfile
 } else {
-    # INSTALLS is not implemented in qmake's s60 generators, copy headers manually
+    # INSTALLS is not implemented in qmake's mmp generators, copy headers manually
 
     inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
     inst_modfile.input = moduleFile
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 79a8ce40be..56a03c9bfc 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -4958,6 +4958,10 @@ void QUrl::setEncodedQuery(const QByteArray &query)
     pairDelimiter(), and the key and value are delimited by
     valueDelimiter().
 
+    \note This method does not encode spaces (ASCII 0x20) as plus (+) signs,
+    like HTML forms do. If you need that kind of encoding, you must encode
+    the value yourself and use QUrl::setEncodedQueryItems.
+
     \sa setQueryDelimiters(), queryItems(), setEncodedQueryItems()
 */
 void QUrl::setQueryItems(const QList<QPair<QString, QString> > &query)
@@ -5028,6 +5032,10 @@ void QUrl::setEncodedQueryItems(const QList<QPair<QByteArray, QByteArray> > &que
     character returned by valueDelimiter(). Each key/value pair is 
     delimited by the character returned by pairDelimiter().
 
+    \note This method does not encode spaces (ASCII 0x20) as plus (+) signs,
+    like HTML forms do. If you need that kind of encoding, you must encode
+    the value yourself and use QUrl::addEncodedQueryItem.
+
     \sa addEncodedQueryItem()
 */
 void QUrl::addQueryItem(const QString &key, const QString &value)
@@ -5084,6 +5092,10 @@ void QUrl::addEncodedQueryItem(const QByteArray &key, const QByteArray &value)
 /*!
     Returns the query string of the URL, as a map of keys and values.
 
+    \note This method does not decode spaces plus (+) signs as spaces (ASCII
+    0x20), like HTML forms do. If you need that kind of decoding, you must
+    use QUrl::encodedQueryItems and decode the data yourself.
+
     \sa setQueryItems(), setEncodedQuery()
 */
 QList<QPair<QString, QString> > QUrl::queryItems() const
@@ -5188,6 +5200,10 @@ bool QUrl::hasEncodedQueryItem(const QByteArray &key) const
     Returns the first query string value whose key is equal to \a key
     from the URL.
 
+    \note This method does not decode spaces plus (+) signs as spaces (ASCII
+    0x20), like HTML forms do. If you need that kind of decoding, you must
+    use QUrl::encodedQueryItemValue and decode the data yourself.
+
     \sa allQueryItemValues()
 */
 QString QUrl::queryItemValue(const QString &key) const
@@ -5232,6 +5248,10 @@ QByteArray QUrl::encodedQueryItemValue(const QByteArray &key) const
     Returns the a list of query string values whose key is equal to
     \a key from the URL.
 
+    \note This method does not decode spaces plus (+) signs as spaces (ASCII
+    0x20), like HTML forms do. If you need that kind of decoding, you must
+    use QUrl::allEncodedQueryItemValues and decode the data yourself.
+
     \sa queryItemValue()
 */
 QStringList QUrl::allQueryItemValues(const QString &key) const
@@ -5610,7 +5630,7 @@ QString QUrl::toString(FormattingOptions options) const
     if ((options & QUrl::RemoveAuthority) != QUrl::RemoveAuthority) {
         bool doFileScheme = d->scheme == QLatin1String("file") && ourPath.startsWith(QLatin1Char('/'));
         QString tmp = d->authority(options);
-        if (!tmp.isEmpty() || doFileScheme) {
+        if (!tmp.isNull() || doFileScheme) {
             if (doFileScheme && !ourPath.startsWith(QLatin1Char('/')))
                 url += QLatin1Char('/');
             url += QLatin1String("//");
diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp
index 2c4ea584ea..633fa00d95 100644
--- a/src/corelib/tools/qelapsedtimer_unix.cpp
+++ b/src/corelib/tools/qelapsedtimer_unix.cpp
@@ -40,22 +40,58 @@
 ****************************************************************************/
 
 #include "qelapsedtimer.h"
-#include "qpair.h"
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 
-#if !defined(QT_NO_CLOCK_MONOTONIC)
-# if defined(QT_BOOTSTRAPPED)
-#  define QT_NO_CLOCK_MONOTONIC
+#if defined(QT_NO_CLOCK_MONOTONIC) || defined(QT_BOOTSTRAPPED)
+// turn off the monotonic clock
+# ifdef _POSIX_MONOTONIC_CLOCK
+#  undef _POSIX_MONOTONIC_CLOCK
 # endif
+# define _POSIX_MONOTONIC_CLOCK -1
 #endif
 
 QT_BEGIN_NAMESPACE
 
-static qint64 fractionAdjustment()
+#if (_POSIX_MONOTONIC_CLOCK-0 != 0)
+static const bool monotonicClockChecked = true;
+static const bool monotonicClockAvailable = _POSIX_MONOTONIC_CLOCK > 0;
+#else
+static int monotonicClockChecked = false;
+static int monotonicClockAvailable = false;
+#endif
+
+#ifdef Q_CC_GNU
+# define is_likely(x) __builtin_expect((x), 1)
+#else
+# define is_likely(x) (x)
+#endif
+#define load_acquire(x) ((volatile const int&)(x))
+#define store_release(x,v) ((volatile int&)(x) = (v))
+
+static void unixCheckClockType()
+{
+#if (_POSIX_MONOTONIC_CLOCK-0 == 0)
+    if (is_likely(load_acquire(monotonicClockChecked)))
+        return;
+
+# if defined(_SC_MONOTONIC_CLOCK)
+    // detect if the system support monotonic timers
+    long x = sysconf(_SC_MONOTONIC_CLOCK);
+    store_release(monotonicClockAvailable, x >= 200112L);
+# endif
+
+    store_release(monotonicClockChecked, true);
+#endif
+}
+
+static inline qint64 fractionAdjustment()
 {
-    if (QElapsedTimer::isMonotonic()) {
+    // disabled, but otherwise indicates bad usage of QElapsedTimer
+    //Q_ASSERT(monotonicClockChecked);
+
+    if (monotonicClockAvailable) {
         // the monotonic timer is measured in nanoseconds
         // 1 ms = 1000000 ns
         return 1000*1000ull;
@@ -68,90 +104,73 @@ static qint64 fractionAdjustment()
 
 bool QElapsedTimer::isMonotonic()
 {
-#if (_POSIX_MONOTONIC_CLOCK-0 > 0)
-    return true;
-#else
-    static int returnValue = 0;
-
-    if (returnValue == 0) {
-#  if (_POSIX_MONOTONIC_CLOCK-0 < 0) || !defined(_SC_MONOTONIC_CLOCK)
-        returnValue = -1;
-#  elif (_POSIX_MONOTONIC_CLOCK == 0)
-        // detect if the system support monotonic timers
-        long x = sysconf(_SC_MONOTONIC_CLOCK);
-        returnValue = (x >= 200112L) ? 1 : -1;
-#  endif
-    }
-
-    return returnValue != -1;
-#endif
+    unixCheckClockType();
+    return monotonicClockAvailable;
 }
 
 QElapsedTimer::ClockType QElapsedTimer::clockType()
 {
-    return isMonotonic() ? MonotonicClock : SystemTime;
+    unixCheckClockType();
+    return monotonicClockAvailable ? MonotonicClock : SystemTime;
 }
 
-static inline QPair<long, long> do_gettime()
+static inline void do_gettime(qint64 *sec, qint64 *frac)
 {
-#if (_POSIX_MONOTONIC_CLOCK-0 > 0)
-    timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    return qMakePair<long,long>(ts.tv_sec, ts.tv_nsec);
-#else
-#  if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED)
-    if (QElapsedTimer::isMonotonic()) {
+#if (_POSIX_MONOTONIC_CLOCK-0 >= 0)
+    unixCheckClockType();
+    if (is_likely(monotonicClockAvailable)) {
         timespec ts;
         clock_gettime(CLOCK_MONOTONIC, &ts);
-        return qMakePair<long,long>(ts.tv_sec, ts.tv_nsec);
+        *sec = ts.tv_sec;
+        *frac = ts.tv_nsec;
+        return;
     }
-#  endif
+#endif
     // use gettimeofday
     timeval tv;
     ::gettimeofday(&tv, 0);
-    return qMakePair<long,long>(tv.tv_sec, tv.tv_usec);
-#endif
+    *sec = tv.tv_sec;
+    *frac = tv.tv_usec;
 }
 
 // used in qcore_unix.cpp and qeventdispatcher_unix.cpp
 timeval qt_gettime()
 {
-    QPair<long, long> r = do_gettime();
+    qint64 sec, frac;
+    do_gettime(&sec, &frac);
 
     timeval tv;
-    tv.tv_sec = r.first;
-    tv.tv_usec = r.second;
-    if (QElapsedTimer::isMonotonic())
+    tv.tv_sec = sec;
+    tv.tv_usec = frac;
+    if (monotonicClockAvailable)
         tv.tv_usec /= 1000;
 
     return tv;
 }
 
+static qint64 elapsedAndRestart(qint64 sec, qint64 frac,
+                                qint64 *nowsec, qint64 *nowfrac)
+{
+    do_gettime(nowsec, nowfrac);
+    sec = *nowsec - sec;
+    frac = *nowfrac - frac;
+    return sec * Q_INT64_C(1000) + frac / fractionAdjustment();
+}
+
 void QElapsedTimer::start()
 {
-    QPair<long, long> r = do_gettime();
-    t1 = r.first;
-    t2 = r.second;
+    do_gettime(&t1, &t2);
 }
 
 qint64 QElapsedTimer::restart()
 {
-    QPair<long, long> r = do_gettime();
-    qint64 oldt1 = t1;
-    qint64 oldt2 = t2;
-    t1 = r.first;
-    t2 = r.second;
-
-    r.first -= oldt1;
-    r.second -= oldt2;
-    return r.first * Q_INT64_C(1000) + r.second / fractionAdjustment();
+    return elapsedAndRestart(t1, t2, &t1, &t2);
 }
 
 qint64 QElapsedTimer::elapsed() const
 {
-    QElapsedTimer now;
-    now.start();
-    return msecsTo(now);
+    qint64 sec, frac;
+    return elapsedAndRestart(t1, t2, &sec, &frac);
 }
 
 qint64 QElapsedTimer::msecsSinceReference() const
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index 68ab0331d9..a9c33f16ff 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -54,8 +54,20 @@
 #if defined(Q_OS_LINUX) && defined(__arm__)
 #include "private/qcore_unix_p.h"
 
-#include <asm/hwcap.h>
-#include <linux/auxvec.h>
+// the kernel header definitions for HWCAP_*
+// (the ones we need/may need anyway)
+
+// copied from <asm/hwcap.h> (ARM)
+#define HWCAP_IWMMXT    512
+#define HWCAP_CRUNCH    1024
+#define HWCAP_THUMBEE   2048
+#define HWCAP_NEON      4096
+#define HWCAP_VFPv3     8192
+#define HWCAP_VFPv3D16  16384
+
+// copied from <linux/auxvec.h>
+#define AT_HWCAP  16    /* arch dependent hints at CPU capabilities */
+
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -140,56 +152,41 @@ static inline uint detectProcessorFeatures()
     uint result = 0;
     /* see p. 118 of amd64 instruction set manual Vol3 */
 #if defined(Q_CC_GNU)
-    asm ("push %%ebx\n"
-         "pushf\n"
-         "pop %%eax\n"
-         "mov %%eax, %%ebx\n"
-         "xor $0x00200000, %%eax\n"
-         "push %%eax\n"
-         "popf\n"
-         "pushf\n"
-         "pop %%eax\n"
-         "xor %%edx, %%edx\n"
-         "xor %%ebx, %%eax\n"
-         "jz 1f\n"
-
-         "mov $0x00000001, %%eax\n"
-         "cpuid\n"
-         "1:\n"
-         "pop %%ebx\n"
-         "mov %%edx, %0\n"
-         "mov %%ecx, %1\n"
-        : "=r" (result), "=r" (feature_result)
-        :
-        : "%eax", "%ecx", "%edx"
-        );
-
-    asm ("push %%ebx\n"
-         "pushf\n"
-         "pop %%eax\n"
-         "mov %%eax, %%ebx\n"
-         "xor $0x00200000, %%eax\n"
-         "push %%eax\n"
+    long cpuid_supported, tmp1;
+    asm ("pushf\n"
+         "pop %0\n"
+         "mov %0, %1\n"
+         "xor $0x00200000, %0\n"
+         "push %0\n"
          "popf\n"
          "pushf\n"
-         "pop %%eax\n"
-         "xor %%edx, %%edx\n"
-         "xor %%ebx, %%eax\n"
-         "jz 2f\n"
-
-         "mov $0x80000000, %%eax\n"
-         "cpuid\n"
-         "cmp $0x80000000, %%eax\n"
-         "jbe 2f\n"
-         "mov $0x80000001, %%eax\n"
-         "cpuid\n"
-         "2:\n"
-         "pop %%ebx\n"
-         "mov %%edx, %0\n"
-        : "=r" (extended_result)
-        :
-        : "%eax", "%ecx", "%edx"
-        );
+         "pop %0\n"
+         "xor %1, %0\n" // %eax is now 0 if CPUID is not supported
+         : "=a" (cpuid_supported), "=r" (tmp1)
+         );
+    if (cpuid_supported) {
+        asm ("xchg %%ebx, %2\n"
+             "cpuid\n"
+             "xchg %%ebx, %2\n"
+            : "=c" (feature_result), "=d" (result), "=&r" (tmp1)
+            : "a" (1));
+
+        asm ("xchg %%ebx, %1\n"
+             "cpuid\n"
+             "cmp $0x80000000, %%eax\n"
+             "jnbe 1f\n"
+             "xor %0, %0\n"
+             "jmp 2f\n"
+             "1:\n"
+             "mov $0x80000001, %%eax\n"
+             "cpuid\n"
+             "2:\n"
+             "xchg %%ebx, %1\n"
+            : "=d" (extended_result), "=&r" (tmp1)
+            : "a" (0x80000000)
+            : "%ecx"
+            );
+    }
 
 #elif defined (Q_OS_WIN)
     _asm {
@@ -289,27 +286,10 @@ static inline uint detectProcessorFeatures()
     uint feature_result = 0;
 
 #if defined(Q_CC_GNU)
-    asm ("push %%rbx\n"
-         "pushf\n"
-         "pop %%rax\n"
-         "mov %%eax, %%ebx\n"
-         "xor $0x00200000, %%eax\n"
-         "push %%rax\n"
-         "popf\n"
-         "pushf\n"
-         "pop %%rax\n"
-         "xor %%edx, %%edx\n"
-         "xor %%ebx, %%eax\n"
-         "jz 1f\n"
-
-         "mov $0x00000001, %%eax\n"
-         "cpuid\n"
-         "1:\n"
-         "pop %%rbx\n"
-         "mov %%ecx, %0\n"
-        : "=r" (feature_result)
-        :
-        : "%eax", "%ecx", "%edx"
+    asm ("cpuid"
+        : "=c" (feature_result)
+        : "a" (1)
+        : "%ebx", "%edx"
         );
 #elif defined (Q_OS_WIN64)
     {
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index d940bf8c40..2813b290d4 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -173,19 +173,6 @@ static int ucstricmp(const ushort *a, const ushort *ae, const uchar *b)
     return 1;
 }
 
-// Unicode case-sensitive comparison
-static int ucstrcmp(const QChar *a, int alen, const QChar *b, int blen)
-{
-    if (a == b && alen == blen)
-        return 0;
-    int l = qMin(alen, blen);
-    while (l-- && *a == *b)
-        a++,b++;
-    if (l == -1)
-        return (alen-blen);
-    return a->unicode() - b->unicode();
-}
-
 // Unicode case-sensitive compare two same-sized strings
 static int ucstrncmp(const QChar *a, const QChar *b, int l)
 {
@@ -196,6 +183,16 @@ static int ucstrncmp(const QChar *a, const QChar *b, int l)
     return a->unicode() - b->unicode();
 }
 
+// Unicode case-sensitive comparison
+static int ucstrcmp(const QChar *a, int alen, const QChar *b, int blen)
+{
+    if (a == b && alen == blen)
+        return 0;
+    int l = qMin(alen, blen);
+    int cmp = ucstrncmp(a, b, l);
+    return cmp ? cmp : (alen-blen);
+}
+
 // Unicode case-insensitive compare two same-sized strings
 static int ucstrnicmp(const ushort *a, const ushort *b, int l)
 {
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 7951177fab..3833874aaf 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -714,6 +714,9 @@ QDBusCallDeliveryEvent* QDBusConnectionPrivate::prepareReply(QDBusConnectionPriv
     if (metaTypes[n] == QDBusMetaTypeId::message)
         --n;
 
+    if (msg.arguments().count() < n)
+        return 0;               // too few arguments
+
     // check that types match
     for (int i = 0; i < n; ++i)
         if (metaTypes.at(i + 1) != msg.arguments().at(i).userType() &&
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 6e6f0cb80b..845b3da7af 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -1427,6 +1427,7 @@ void QDeclarativeAnchorChanges::clearBindings()
     if (!d->target)
         return;
 
+    //### should this (saving "from" values) be moved to saveCurrentValues()?
     d->fromX = d->target->x();
     d->fromY = d->target->y();
     d->fromWidth = d->target->width();
@@ -1486,22 +1487,8 @@ void QDeclarativeAnchorChanges::rewind()
         return;
 
     QDeclarativeItemPrivate *targetPrivate = QDeclarativeItemPrivate::get(d->target);
-    //restore previous anchors
-    if (d->rewindLeft.anchorLine != QDeclarativeAnchorLine::Invalid)
-        targetPrivate->anchors()->setLeft(d->rewindLeft);
-    if (d->rewindRight.anchorLine != QDeclarativeAnchorLine::Invalid)
-        targetPrivate->anchors()->setRight(d->rewindRight);
-    if (d->rewindHCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
-        targetPrivate->anchors()->setHorizontalCenter(d->rewindHCenter);
-    if (d->rewindTop.anchorLine != QDeclarativeAnchorLine::Invalid)
-        targetPrivate->anchors()->setTop(d->rewindTop);
-    if (d->rewindBottom.anchorLine != QDeclarativeAnchorLine::Invalid)
-        targetPrivate->anchors()->setBottom(d->rewindBottom);
-    if (d->rewindVCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
-        targetPrivate->anchors()->setVerticalCenter(d->rewindVCenter);
-    if (d->rewindBaseline.anchorLine != QDeclarativeAnchorLine::Invalid)
-        targetPrivate->anchors()->setBaseline(d->rewindBaseline);
 
+    //restore previous values (but not previous bindings, i.e. anchors)
     d->target->setX(d->rewindX);
     d->target->setY(d->rewindY);
     if (targetPrivate->widthValid) {
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 9f198e4f31..d82c4bb89f 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -176,7 +176,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
                 if (action.event->isReversable()) {
                     action.event->clearBindings();
                     action.event->rewind();
-                    action.event->clearBindings();
+                    action.event->clearBindings();  //### shouldn't be needed
                 }
                 continue;
             }
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 9d571b518d..dbdf0bc27c 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -63,6 +63,42 @@ QT_BEGIN_NAMESPACE
 const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08,
                                      0x10, 0x20, 0x40, 0x80 };
 
+static bool cleanup_function_registered = false;
+static QS60PixmapData *firstPixmap = 0;
+
+static void qt_symbian_register_pixmap(QS60PixmapData *pd)
+{
+    if(!cleanup_function_registered) {
+        qAddPostRoutine(qt_symbian_release_pixmaps);
+        cleanup_function_registered = true;
+    }
+
+    pd->next = firstPixmap;
+    pd->prev = 0;
+    if (firstPixmap)
+        firstPixmap->prev = pd;
+    firstPixmap = pd;
+}
+
+static void qt_symbian_unregister_pixmap(QS60PixmapData *pd)
+{
+    if (pd->next)
+        pd->next->prev = pd->prev;
+    if (pd->prev)
+        pd->prev->next = pd->next;
+    else
+        firstPixmap = pd->next;
+}
+
+static void qt_symbian_release_pixmaps()
+{
+    // Scan all QS60PixmapData objects in the system and destroy them.
+    QS60PixmapData *pd = firstPixmap;
+    while (pd != 0) {
+        pd->release();
+        pd = pd->next;
+    }
+}
 
 /*
     \class QSymbianFbsClient
@@ -356,15 +392,18 @@ QS60PixmapData::QS60PixmapData(PixelType type) : QRasterPixmapData(type),
     cfbsBitmap(0),
     pengine(0),
     bytes(0),
-    formatLocked(false)
+    formatLocked(false),
+    next(0),
+    prev(0)
 {
-
+    qt_symbian_register_pixmap(this);
 }
 
 QS60PixmapData::~QS60PixmapData()
 {
     release();
     delete symbianBitmapDataAccess;
+    qt_symbian_unregister_pixmap(this);
 }
 
 void QS60PixmapData::resize(int width, int height)
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h
index 85c9ebe751..a82f5c27ef 100644
--- a/src/gui/image/qpixmap_s60_p.h
+++ b/src/gui/image/qpixmap_s60_p.h
@@ -63,6 +63,11 @@ class CFbsBitGc;
 
 class QSymbianBitmapDataAccess;
 
+class QS60PixmapData;
+void qt_symbian_register_pixmap(QS60PixmapData *pd);
+void qt_symbian_unregister_pixmap(QS60PixmapData *pd);
+void qt_symbian_release_pixmaps();
+
 class QSymbianFbsHeapLock
 {
 public:
@@ -120,6 +125,13 @@ private:
 
     bool formatLocked;
 
+    QS60PixmapData *next;
+    QS60PixmapData *prev;
+
+    friend void qt_symbian_register_pixmap(QS60PixmapData *pd);
+    friend void qt_symbian_unregister_pixmap(QS60PixmapData *pd);
+    friend void qt_symbian_release_pixmaps();
+
     friend class QPixmap;
     friend class QS60WindowSurface;
     friend class QS60PaintEngine;
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index 321492dfde..dd819e5ce3 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -737,9 +737,6 @@ static void qt_post_window_change_event(QWidget *widget)
 */
 static void qt_mac_update_child_gl_widgets(QWidget *widget)
 {
-    if (widget->isWindow())
-        return;
-
     // Update all OpenGL child widgets for the given widget.
     QList<QWidgetPrivate::GlWidgetInfo> &glWidgets = qt_widget_private(widget)->glWidgets;
     QList<QWidgetPrivate::GlWidgetInfo>::iterator end = glWidgets.end();
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index 679514946c..ddf1a2738f 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -58,6 +58,8 @@ QT_BEGIN_NAMESPACE
 extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm
 extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp
+extern void qt_event_request_window_change(QWidget *); // qapplication_mac.mm
+extern void qt_mac_send_posted_gl_updates(QWidget *widget); // qapplication_mac.mm
 
 Q_GLOBAL_STATIC(QPointer<QWidget>, currentDragTarget);
 
@@ -227,6 +229,19 @@ QT_END_NAMESPACE
     [self release];
 }
 
+- (void)setInitialFirstResponder:(NSView *)view
+{
+    // This method is called the first time the window is placed on screen and
+    // is the earliest point in time we can connect OpenGL contexts to NSViews.
+    QWidget *qwidget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self];
+    if (qwidget) {
+        qt_event_request_window_change(qwidget);
+        qt_mac_send_posted_gl_updates(qwidget);
+    }
+
+    [super setInitialFirstResponder:view];
+}
+
 - (BOOL)makeFirstResponder:(NSResponder *)responder
 {
     // For some reason Cocoa wants to flip the first responder
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index cf487b56a5..03ed597d5a 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -1485,7 +1485,7 @@ static const uint L2CacheLineLengthInInts = L2CacheLineLength/sizeof(uint);
     }\
 }
 
-static void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint, uint const_alpha)
 {
     comp_func_Clear_impl(dest, length, const_alpha);
 }
@@ -1499,7 +1499,7 @@ void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, uint cons
   result = s
   dest = s * ca + d * cia
 */
-static void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255) {
         QT_MEMFILL_UINT(dest, length, color);
@@ -1528,7 +1528,7 @@ void QT_FASTCALL comp_func_Source(uint *dest, const uint *src, int length, uint
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Destination(uint *, int, uint, uint)
+void QT_FASTCALL comp_func_solid_Destination(uint *, int, uint, uint)
 {
 }
 
@@ -1542,7 +1542,7 @@ void QT_FASTCALL comp_func_Destination(uint *, const uint *, int, uint)
        = s * ca + d * (sia * ca + cia)
        = s * ca + d * (1 - sa*ca)
 */
-static void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint color, uint const_alpha)
 {
     if ((const_alpha & qAlpha(color)) == 255) {
         QT_MEMFILL_UINT(dest, length, color);
@@ -1583,7 +1583,7 @@ void QT_FASTCALL comp_func_SourceOver(uint *dest, const uint *src, int length, u
   dest = (d + s * dia) * ca + d * cia
        = d + s * dia * ca
 */
-static void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha != 255)
         color = BYTE_MUL(color, const_alpha);
@@ -1618,7 +1618,7 @@ void QT_FASTCALL comp_func_DestinationOver(uint *dest, const uint *src, int leng
   result = s * da
   dest = s * da * ca + d * cia
 */
-static void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, uint const_alpha)
 {
     PRELOAD_INIT(dest)
     if (const_alpha == 255) {
@@ -1661,7 +1661,7 @@ void QT_FASTCALL comp_func_SourceIn(uint *dest, const uint *src, int length, uin
   dest = d * sa * ca + d * cia
        = d * (sa * ca + cia)
 */
-static void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, uint color, uint const_alpha)
 {
     uint a = qAlpha(color);
     if (const_alpha != 255) {
@@ -1697,7 +1697,7 @@ void QT_FASTCALL comp_func_DestinationIn(uint *dest, const uint *src, int length
   dest = s * dia * ca + d * cia
 */
 
-static void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, uint const_alpha)
 {
     PRELOAD_INIT(dest)
     if (const_alpha == 255) {
@@ -1740,7 +1740,7 @@ void QT_FASTCALL comp_func_SourceOut(uint *dest, const uint *src, int length, ui
   dest = d * sia * ca + d * cia
        = d * (sia * ca + cia)
 */
-static void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, uint color, uint const_alpha)
 {
     uint a = qAlpha(~color);
     if (const_alpha != 255)
@@ -1776,7 +1776,7 @@ void QT_FASTCALL comp_func_DestinationOut(uint *dest, const uint *src, int lengt
        = s*ca * da + d * (sia*ca + cia)
        = s*ca * da + d * (1 - sa*ca)
 */
-static void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha != 255) {
         color = BYTE_MUL(color, const_alpha);
@@ -1814,7 +1814,7 @@ void QT_FASTCALL comp_func_SourceAtop(uint *dest, const uint *src, int length, u
   dest = d*sa*ca + s*dia*ca + d *cia
        = s*ca * dia + d * (sa*ca + cia)
 */
-static void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length, uint color, uint const_alpha)
 {
     uint a = qAlpha(color);
     if (const_alpha != 255) {
@@ -1857,7 +1857,7 @@ void QT_FASTCALL comp_func_DestinationAtop(uint *dest, const uint *src, int leng
        = s*ca * dia + d * (sia*ca + cia)
        = s*ca * dia + d * (1 - sa*ca)
 */
-static void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha != 255)
         color = BYTE_MUL(color, const_alpha);
@@ -1938,7 +1938,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Plus_impl(uint *dest, int
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Plus_impl(dest, length, color, QFullCoverage());
@@ -2002,7 +2002,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Multiply_impl(uint *dest,
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Multiply_impl(dest, length, color, QFullCoverage());
@@ -2070,7 +2070,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Screen_impl(uint *dest, i
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Screen_impl(dest, length, color, QFullCoverage());
@@ -2149,7 +2149,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Overlay_impl(uint *dest,
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Overlay_impl(dest, length, color, QFullCoverage());
@@ -2222,7 +2222,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Darken_impl(uint *dest, i
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Darken_impl(dest, length, color, QFullCoverage());
@@ -2295,7 +2295,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Lighten_impl(uint *dest,
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Lighten_impl(dest, length, color, QFullCoverage());
@@ -2378,7 +2378,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorDodge_impl(uint *des
     }
 }
 
-static void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_ColorDodge_impl(dest, length, color, QFullCoverage());
@@ -2461,7 +2461,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorBurn_impl(uint *dest
     }
 }
 
-static void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_ColorBurn_impl(dest, length, color, QFullCoverage());
@@ -2541,7 +2541,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_HardLight_impl(uint *dest
     }
 }
 
-static void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_HardLight_impl(dest, length, color, QFullCoverage());
@@ -2632,7 +2632,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_SoftLight_impl(uint *dest
     }
 }
 
-static void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_SoftLight_impl(dest, length, color, QFullCoverage());
@@ -2705,7 +2705,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Difference_impl(uint *des
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Difference_impl(dest, length, color, QFullCoverage());
@@ -2772,7 +2772,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void QT_FASTCALL comp_func_solid_Exclusion_imp
     }
 }
 
-static void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha)
+void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha)
 {
     if (const_alpha == 255)
         comp_func_solid_Exclusion_impl(dest, length, color, QFullCoverage());
@@ -2816,10 +2816,10 @@ void QT_FASTCALL comp_func_Exclusion(uint *dest, const uint *src, int length, ui
 #  pragma pop
 #endif
 
-static void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest,
-                                                           int length,
-                                                           uint color,
-                                                           uint const_alpha)
+void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest,
+                                                    int length,
+                                                    uint color,
+                                                    uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     while (length--)
@@ -2836,10 +2836,10 @@ void QT_FASTCALL rasterop_SourceOrDestination(uint *dest,
         *dest++ |= *src++;
 }
 
-static void QT_FASTCALL rasterop_solid_SourceAndDestination(uint *dest,
-                                                            int length,
-                                                            uint color,
-                                                            uint const_alpha)
+void QT_FASTCALL rasterop_solid_SourceAndDestination(uint *dest,
+                                                     int length,
+                                                     uint color,
+                                                     uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     color |= 0xff000000;
@@ -2859,10 +2859,10 @@ void QT_FASTCALL rasterop_SourceAndDestination(uint *dest,
     }
 }
 
-static void QT_FASTCALL rasterop_solid_SourceXorDestination(uint *dest,
-                                                            int length,
-                                                            uint color,
-                                                            uint const_alpha)
+void QT_FASTCALL rasterop_solid_SourceXorDestination(uint *dest,
+                                                     int length,
+                                                     uint color,
+                                                     uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     color &= 0x00ffffff;
@@ -2882,10 +2882,10 @@ void QT_FASTCALL rasterop_SourceXorDestination(uint *dest,
     }
 }
 
-static void QT_FASTCALL rasterop_solid_NotSourceAndNotDestination(uint *dest,
-                                                                  int length,
-                                                                  uint color,
-                                                                  uint const_alpha)
+void QT_FASTCALL rasterop_solid_NotSourceAndNotDestination(uint *dest,
+                                                           int length,
+                                                           uint color,
+                                                           uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     color = ~color;
@@ -2907,10 +2907,10 @@ void QT_FASTCALL rasterop_NotSourceAndNotDestination(uint *dest,
     }
 }
 
-static void QT_FASTCALL rasterop_solid_NotSourceOrNotDestination(uint *dest,
-                                                                 int length,
-                                                                 uint color,
-                                                                 uint const_alpha)
+void QT_FASTCALL rasterop_solid_NotSourceOrNotDestination(uint *dest,
+                                                          int length,
+                                                          uint color,
+                                                          uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     color = ~color | 0xff000000;
@@ -2932,10 +2932,10 @@ void QT_FASTCALL rasterop_NotSourceOrNotDestination(uint *dest,
     }
 }
 
-static void QT_FASTCALL rasterop_solid_NotSourceXorDestination(uint *dest,
-                                                               int length,
-                                                               uint color,
-                                                               uint const_alpha)
+void QT_FASTCALL rasterop_solid_NotSourceXorDestination(uint *dest,
+                                                        int length,
+                                                        uint color,
+                                                        uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     color = ~color & 0x00ffffff;
@@ -2957,8 +2957,8 @@ void QT_FASTCALL rasterop_NotSourceXorDestination(uint *dest,
     }
 }
 
-static void QT_FASTCALL rasterop_solid_NotSource(uint *dest, int length,
-                                                 uint color, uint const_alpha)
+void QT_FASTCALL rasterop_solid_NotSource(uint *dest, int length,
+                                          uint color, uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     qt_memfill(dest, ~color | 0xff000000, length);
@@ -2972,10 +2972,10 @@ void QT_FASTCALL rasterop_NotSource(uint *dest, const uint *src,
         *dest++ = ~(*src++) | 0xff000000;
 }
 
-static void QT_FASTCALL rasterop_solid_NotSourceAndDestination(uint *dest,
-                                                               int length,
-                                                               uint color,
-                                                               uint const_alpha)
+void QT_FASTCALL rasterop_solid_NotSourceAndDestination(uint *dest,
+                                                        int length,
+                                                        uint color,
+                                                        uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     color = ~color | 0xff000000;
@@ -2997,10 +2997,10 @@ void QT_FASTCALL rasterop_NotSourceAndDestination(uint *dest,
     }
 }
 
-static void QT_FASTCALL rasterop_solid_SourceAndNotDestination(uint *dest,
-                                                               int length,
-                                                               uint color,
-                                                               uint const_alpha)
+void QT_FASTCALL rasterop_solid_SourceAndNotDestination(uint *dest,
+                                                        int length,
+                                                        uint color,
+                                                        uint const_alpha)
 {
     Q_UNUSED(const_alpha);
     while (length--) {
@@ -7739,6 +7739,55 @@ void qInitDrawhelperAsm()
 
 #ifdef QT_HAVE_SSE
     if (features & SSE) {
+        extern void qt_blend_rgb32_on_rgb32_sse(uchar *destPixels, int dbpl,
+                                                const uchar *srcPixels, int sbpl,
+                                                int w, int h,
+                                                int const_alpha);
+        extern void qt_blend_argb32_on_argb32_sse(uchar *destPixels, int dbpl,
+                                                  const uchar *srcPixels, int sbpl,
+                                                  int w, int h,
+                                                  int const_alpha);
+
+        qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse;
+        qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse;
+        qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse;
+        qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse;
+    }
+#endif // SSE
+
+#ifdef QT_HAVE_SSE2
+    if (features & SSE2) {
+        extern void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl,
+                                                 const uchar *srcPixels, int sbpl,
+                                                 int w, int h,
+                                                 int const_alpha);
+        extern void qt_blend_argb32_on_argb32_sse2(uchar *destPixels, int dbpl,
+                                                   const uchar *srcPixels, int sbpl,
+                                                   int w, int h,
+                                                   int const_alpha);
+
+        qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2;
+        qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2;
+        qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2;
+        qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2;
+    }
+
+#ifdef QT_HAVE_SSSE3
+    if (features & SSSE3) {
+        extern void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl,
+                                                    const uchar *srcPixels, int sbpl,
+                                                    int w, int h,
+                                                    int const_alpha);
+
+        qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
+        qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
+    }
+#endif // SSSE3
+
+#endif // SSE2
+
+#ifdef QT_HAVE_SSE
+    if (features & SSE) {
         functionForModeAsm = qt_functionForMode_SSE;
         functionForModeSolidAsm = qt_functionForModeSolid_SSE;
         qDrawHelper[QImage::Format_ARGB32_Premultiplied].blendColor = qt_blend_color_argb_sse;
@@ -7754,9 +7803,9 @@ void qInitDrawhelperAsm()
 #ifdef QT_HAVE_SSE2
         if (features & SSE2) {
             extern void QT_FASTCALL comp_func_SourceOver_sse2(uint *destPixels,
-                                                  const uint *srcPixels,
-                                                  int length,
-                                                  uint const_alpha);
+                                                              const uint *srcPixels,
+                                                              int length,
+                                                              uint const_alpha);
             extern void QT_FASTCALL comp_func_solid_SourceOver_sse2(uint *destPixels, int length, uint color, uint const_alpha);
             extern void QT_FASTCALL comp_func_Plus_sse2(uint *dst, const uint *src, int length, uint const_alpha);
             extern void QT_FASTCALL comp_func_Source_sse2(uint *dst, const uint *src, int length, uint const_alpha);
@@ -7765,51 +7814,16 @@ void qInitDrawhelperAsm()
             functionForModeAsm[QPainter::CompositionMode_Source] = comp_func_Source_sse2;
             functionForModeAsm[QPainter::CompositionMode_Plus] = comp_func_Plus_sse2;
             functionForModeSolidAsm[0] = comp_func_solid_SourceOver_sse2;
-
-            extern void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl,
-                                                     const uchar *srcPixels, int sbpl,
-                                                     int w, int h,
-                                                     int const_alpha);
-            extern void qt_blend_argb32_on_argb32_sse2(uchar *destPixels, int dbpl,
-                                                       const uchar *srcPixels, int sbpl,
-                                                       int w, int h,
-                                                       int const_alpha);
-
-            qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2;
-            qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2;
-            qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2;
-            qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2;
-
-#if defined(QT_HAVE_SSSE3)
-            if (features & SSSE3) {
-                extern void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl,
-                                                            const uchar *srcPixels, int sbpl,
-                                                            int w, int h,
-                                                            int const_alpha);
-                qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
-                qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
-            }
-#endif // QT_HAVE_SSSE3
-        } else
-#endif
-        {
-            extern void qt_blend_rgb32_on_rgb32_sse(uchar *destPixels, int dbpl,
-                                                    const uchar *srcPixels, int sbpl,
-                                                    int w, int h,
-                                                    int const_alpha);
-            extern void qt_blend_argb32_on_argb32_sse(uchar *destPixels, int dbpl,
-                                                      const uchar *srcPixels, int sbpl,
-                                                      int w, int h,
-                                                      int const_alpha);
-
-
-            qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse;
-            qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse;
-            qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse;
-            qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse;
         }
-}
-#endif // SSE
+#endif
+    }
+#elif defined(QT_HAVE_SSE2)
+    // this is the special case when SSE2 is usable but MMX/SSE is not usable (e.g.: Windows x64 + visual studio)
+    if (features & SSE2) {
+        functionForModeAsm = qt_functionForMode_onlySSE2;
+        functionForModeSolidAsm = qt_functionForModeSolid_onlySSE2;
+    }
+#endif
 
 #ifdef QT_HAVE_IWMMXT
     if (features & IWMMXT) {
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index 5747da5a7d..0cc2e409e1 100644
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -1997,6 +1997,41 @@ void QT_FASTCALL rasterop_NotSource(uint *dest, const uint *src, int length, uin
 void QT_FASTCALL rasterop_NotSourceAndDestination(uint *dest, const uint *src, int length, uint const_alpha);
 void QT_FASTCALL rasterop_SourceAndNotDestination(uint *dest, const uint *src, int length, uint const_alpha);
 
+// prototypes of all the solid composition functions
+void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Destination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_SourceAndDestination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_SourceXorDestination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_NotSourceAndNotDestination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_NotSourceOrNotDestination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_NotSourceXorDestination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_NotSource(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_NotSourceAndDestination(uint *dest, int length, uint color, uint const_alpha);
+void QT_FASTCALL rasterop_solid_SourceAndNotDestination(uint *dest, int length, uint color, uint const_alpha);
+
 QT_END_NAMESPACE
 
 #endif // QDRAWHELPER_P_H
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp
index 5b674b5aef..ba2ba323f9 100644
--- a/src/gui/painting/qdrawhelper_sse2.cpp
+++ b/src/gui/painting/qdrawhelper_sse2.cpp
@@ -311,6 +311,78 @@ void QT_FASTCALL comp_func_solid_SourceOver_sse2(uint *destPixels, int length, u
     }
 }
 
+CompositionFunctionSolid qt_functionForModeSolid_onlySSE2[numCompositionFunctions] = {
+    comp_func_solid_SourceOver_sse2,
+    comp_func_solid_DestinationOver,
+    comp_func_solid_Clear,
+    comp_func_solid_Source,
+    comp_func_solid_Destination,
+    comp_func_solid_SourceIn,
+    comp_func_solid_DestinationIn,
+    comp_func_solid_SourceOut,
+    comp_func_solid_DestinationOut,
+    comp_func_solid_SourceAtop,
+    comp_func_solid_DestinationAtop,
+    comp_func_solid_XOR,
+    comp_func_solid_Plus,
+    comp_func_solid_Multiply,
+    comp_func_solid_Screen,
+    comp_func_solid_Overlay,
+    comp_func_solid_Darken,
+    comp_func_solid_Lighten,
+    comp_func_solid_ColorDodge,
+    comp_func_solid_ColorBurn,
+    comp_func_solid_HardLight,
+    comp_func_solid_SoftLight,
+    comp_func_solid_Difference,
+    comp_func_solid_Exclusion,
+    rasterop_solid_SourceOrDestination,
+    rasterop_solid_SourceAndDestination,
+    rasterop_solid_SourceXorDestination,
+    rasterop_solid_NotSourceAndNotDestination,
+    rasterop_solid_NotSourceOrNotDestination,
+    rasterop_solid_NotSourceXorDestination,
+    rasterop_solid_NotSource,
+    rasterop_solid_NotSourceAndDestination,
+    rasterop_solid_SourceAndNotDestination
+};
+
+CompositionFunction qt_functionForMode_onlySSE2[numCompositionFunctions] = {
+    comp_func_SourceOver_sse2,
+    comp_func_DestinationOver,
+    comp_func_Clear,
+    comp_func_Source_sse2,
+    comp_func_Destination,
+    comp_func_SourceIn,
+    comp_func_DestinationIn,
+    comp_func_SourceOut,
+    comp_func_DestinationOut,
+    comp_func_SourceAtop,
+    comp_func_DestinationAtop,
+    comp_func_XOR,
+    comp_func_Plus_sse2,
+    comp_func_Multiply,
+    comp_func_Screen,
+    comp_func_Overlay,
+    comp_func_Darken,
+    comp_func_Lighten,
+    comp_func_ColorDodge,
+    comp_func_ColorBurn,
+    comp_func_HardLight,
+    comp_func_SoftLight,
+    comp_func_Difference,
+    comp_func_Exclusion,
+    rasterop_SourceOrDestination,
+    rasterop_SourceAndDestination,
+    rasterop_SourceXorDestination,
+    rasterop_NotSourceAndNotDestination,
+    rasterop_NotSourceOrNotDestination,
+    rasterop_NotSourceXorDestination,
+    rasterop_NotSource,
+    rasterop_NotSourceAndDestination,
+    rasterop_SourceAndNotDestination
+};
+
 void qt_memfill16_sse2(quint16 *dest, quint16 value, int count)
 {
     if (count < 3) {
diff --git a/src/gui/painting/qdrawhelper_x86_p.h b/src/gui/painting/qdrawhelper_x86_p.h
index d7282a7fc3..09ccd77f52 100644
--- a/src/gui/painting/qdrawhelper_x86_p.h
+++ b/src/gui/painting/qdrawhelper_x86_p.h
@@ -122,6 +122,9 @@ void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl,
                                  const uchar *srcPixels, int sbpl,
                                  int w, int h,
                                  int const_alpha);
+
+extern CompositionFunction qt_functionForMode_onlySSE2[];
+extern CompositionFunctionSolid qt_functionForModeSolid_onlySSE2[];
 #endif // QT_HAVE_SSE2
 
 #ifdef QT_HAVE_IWMMXT
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 119217a8ea..05de8f5ad8 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2263,6 +2263,9 @@ bool QTextEngine::atWordSeparator(int position) const
     case ',':
     case '?':
     case '!':
+    case '@':
+    case '#':
+    case '$':
     case ':':
     case ';':
     case '-':
@@ -2283,6 +2286,7 @@ bool QTextEngine::atWordSeparator(int position) const
     case '*':
     case '\'':
     case '"':
+    case '`':
     case '~':
     case '|':
         return true;
diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm
index 66fe7d33ed..f023a97c75 100644
--- a/src/opengl/qgl_mac.mm
+++ b/src/opengl/qgl_mac.mm
@@ -697,9 +697,17 @@ void QGLContext::updatePaintDevice()
         QWidget *w = (QWidget *)d->paintDevice;
         NSView *view = qt_mac_nativeview_for(w);
 
-        // ideally we would use QWidget::isVisible(), but we get "invalid drawable" errors
-        if (![(NSWindow *)qt_mac_window_for(w) isVisible])
-            return;
+        // Trying to attach the GL context to the NSView will fail with
+        // "invalid drawable" if done too soon, but we have to make sure
+        // the connection is made before the first paint event. Using
+        // the NSView do to this check fails as the NSView is visible
+        // before it's safe to connect, and using the NSWindow fails as
+        // the NSWindow will become visible after the first paint event.
+        // This leaves us with the QWidget, who's visible state seems
+        // to match the point in time when it's safe to connect.
+        if (!w || !w->isVisible())
+            return; // Not safe to attach GL context to view yet
+
         if ([static_cast<NSOpenGLContext *>(d->cx) view] != view && ![view isHidden])
             [static_cast<NSOpenGLContext *>(d->cx) setView:view];
     } else if (d->paintDevice->devType() == QInternal::Pixmap) {
diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro
index 4be752bcca..dec408c724 100644
--- a/src/plugins/bearer/connman/connman.pro
+++ b/src/plugins/bearer/connman/connman.pro
@@ -4,12 +4,14 @@ include(../../qpluginbase.pri)
 QT = core network dbus
 
 HEADERS += qconnmanservice_linux_p.h \
+           qofonoservice_linux_p.h \
            qconnmanengine.h \
            ../qnetworksession_impl.h \
            ../qbearerengine_impl.h
 
 SOURCES += main.cpp \
            qconnmanservice_linux.cpp \
+           qofonoservice_linux.cpp \
            qconnmanengine.cpp \
            ../qnetworksession_impl.cpp
 
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index 341f7cda2a..a8b8911176 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -41,6 +41,7 @@
 
 #include "qconnmanengine.h"
 #include "qconnmanservice_linux_p.h"
+#include "qofonoservice_linux_p.h"
 #include "../qnetworksession_impl.h"
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
@@ -109,7 +110,6 @@ void QConnmanEngine::initialize()
 QList<QNetworkConfigurationPrivate *> QConnmanEngine::getConfigurations()
 {
     QMutexLocker locker(&mutex);
-  //  foundConfigurations.clear();
     getNetworkListing();
     QList<QNetworkConfigurationPrivate *> fetchedConfigurations;
     QNetworkConfigurationPrivate* cpPriv = 0;
@@ -131,7 +131,6 @@ QList<QNetworkConfigurationPrivate *> QConnmanEngine::getConfigurations()
         delete config;
     }
     return fetchedConfigurations;
-//    return foundConfigurations;
 }
 
 void QConnmanEngine::getNetworkListing()
@@ -149,7 +148,6 @@ void QConnmanEngine::getNetworkListing()
     }
 }
 
-
 void QConnmanEngine::doRequestUpdate()
 {
     connmanManager->requestScan("");
@@ -184,11 +182,24 @@ void QConnmanEngine::connectToId(const QString &id)
 void QConnmanEngine::disconnectFromId(const QString &id)
 {
     QMutexLocker locker(&mutex);
-    QConnmanServiceInterface serv(serviceFromId(id));
+    QString servicePath = serviceFromId(id);
+    QConnmanServiceInterface serv(servicePath);
     if(!serv.isValid()) {
         emit connectionError(id, DisconnectionError);
     } else {
-        serv.disconnect();
+        if(serv.getType() != "cellular") {
+            serv.disconnect();
+        } else {
+            QOfonoManagerInterface ofonoManager(0);
+            QString modemPath = ofonoManager.currentModem().path();
+            QOfonoDataConnectionManagerInterface dc(modemPath,0);
+            foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) {
+                if(dcPath.path().contains(servicePath.section("_",-1))) {
+                    QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0);
+                    primaryContext.setActive(false);
+                }
+            }
+        }
     }
 }
 
@@ -324,7 +335,6 @@ QString QConnmanEngine::getServiceForNetwork(const QString &netPath)
     return QString();
 }
 
-
 void QConnmanEngine::propertyChangedContext(const QString &path,const QString &item, const QDBusVariant &value)
 {
     Q_UNUSED(path);
@@ -376,7 +386,7 @@ void QConnmanEngine::servicePropertyChangedContext(const QString &path,const QSt
     }
 }
 
-void QConnmanEngine::networkPropertyChangedContext(const QString &path,const QString &item, const QDBusVariant &value)
+void QConnmanEngine::networkPropertyChangedContext(const QString &/*path*/,const QString &/*item*/, const QDBusVariant &/*value*/)
 {
     QMutexLocker locker(&mutex);
 }
@@ -388,7 +398,6 @@ void QConnmanEngine::devicePropertyChangedContext(const QString &devpath,const Q
 
         QConnmanNetworkInterface network(devpath, this);
 
-
         QDBusArgument arg = qvariant_cast<QDBusArgument>(value.variant());
         QStringList remainingNetworks  = qdbus_cast<QStringList>(arg);
         QString devicetype;
@@ -502,10 +511,18 @@ QNetworkConfiguration::StateFlags QConnmanEngine::getStateForService(const QStri
     QMutexLocker locker(&mutex);
     QConnmanServiceInterface serv(service);
     QNetworkConfiguration::StateFlags flag = QNetworkConfiguration::Defined;
-    if(serv.isFavorite()) {
-        flag = ( flag | QNetworkConfiguration::Discovered);
+    if( serv.getType() == "cellular") {
+        if(serv.isSetupRequired()) {
+            flag = ( flag | QNetworkConfiguration::Defined);
+        } else {
+            flag = ( flag | QNetworkConfiguration::Discovered);
+        }
     } else {
-        flag = QNetworkConfiguration::Undefined;
+        if(serv.isFavorite()) {
+            flag = ( flag | QNetworkConfiguration::Discovered);
+        } else {
+            flag = QNetworkConfiguration::Undefined;
+        }
     }
 
     if(serv.getState() == "ready" || serv.getState() == "online") {
@@ -524,8 +541,7 @@ QNetworkConfiguration::BearerType QConnmanEngine::typeToBearer(const QString &ty
     if (type == "bluetooth")
         return QNetworkConfiguration::BearerBluetooth;
     if (type == "cellular") {
-        return QNetworkConfiguration::Bearer2G;
-        // not handled: CDMA2000 HSPA
+        return ofonoTechToBearerType(type);
     }
     if (type == "wimax")
         return QNetworkConfiguration::BearerWiMAX;
@@ -536,6 +552,51 @@ QNetworkConfiguration::BearerType QConnmanEngine::typeToBearer(const QString &ty
     return QNetworkConfiguration::BearerUnknown;
 }
 
+QNetworkConfiguration::BearerType QConnmanEngine::ofonoTechToBearerType(const QString &/*type*/)
+{
+    QOfonoManagerInterface ofonoManager(this);
+    QOfonoNetworkRegistrationInterface ofonoNetwork(ofonoManager.currentModem().path(),this);
+
+    if(ofonoNetwork.isValid()) {
+        foreach(const QDBusObjectPath op,ofonoNetwork.getOperators() ) {
+            QOfonoNetworkOperatorInterface opIface(op.path(),this);
+
+            foreach(const QString opTech, opIface.getTechnologies()) {
+
+                if(opTech == "gsm") {
+                    return QNetworkConfiguration::Bearer2G;
+                }
+                if(opTech == "edge"){
+                    return QNetworkConfiguration::BearerCDMA2000; //wrong, I know
+                }
+                if(opTech == "umts"){
+                    return QNetworkConfiguration::BearerWCDMA;
+                }
+                if(opTech == "hspa"){
+                    return QNetworkConfiguration::BearerHSPA;
+                }
+                if(opTech == "lte"){
+                    return QNetworkConfiguration::BearerWiMAX; //not exact
+                }
+            }
+        }
+    }
+    return QNetworkConfiguration::BearerUnknown;
+}
+
+bool QConnmanEngine::isRoamingAllowed(const QString &context)
+{
+    QOfonoManagerInterface ofonoManager(this);
+    QString modemPath = ofonoManager.currentModem().path();
+    QOfonoDataConnectionManagerInterface dc(modemPath,this);
+    foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) {
+        if(dcPath.path().contains(context.section("_",-1))) {
+            return dc.isRoamingAllowed();
+        }
+    }
+    return false;
+}
+
 void QConnmanEngine::removeConfiguration(const QString &id)
 {
     QMutexLocker locker(&mutex);
@@ -564,7 +625,6 @@ void QConnmanEngine::removeConfiguration(const QString &id)
 
 void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
 {
-
     QMutexLocker locker(&mutex);
     QConnmanServiceInterface *serv;
     serv = new QConnmanServiceInterface(servicePath);
@@ -589,36 +649,31 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
 
         QString networkName = serv->getName();
 
-        if(serv->getType() == "cellular") {
-            networkName = serv->getAPN();
-            if(networkName.isEmpty()) {
-                networkName = serv->getName();
-            }
-        }
-
-        cpPriv->name = networkName;
-        cpPriv->isValid = true;
-        cpPriv->id = id;
-        cpPriv->type = QNetworkConfiguration::InternetAccessPoint;
-
-
         const QString connectionType = serv->getType();
         if (connectionType == "ethernet") {
             cpPriv->bearerType = QNetworkConfiguration::BearerEthernet;
         } else if (connectionType == "wifi") {
             cpPriv->bearerType = QNetworkConfiguration::BearerWLAN;
         } else if (connectionType == "cellular") {
-            const QString mode = serv->getMode();
-            if (mode == "gprs" || mode == "edge")
-                cpPriv->bearerType = QNetworkConfiguration::Bearer2G;
-            else if (mode == "umts")
-                cpPriv->bearerType = QNetworkConfiguration::BearerWCDMA;
+            cpPriv->bearerType = ofonoTechToBearerType("cellular");
+            if(servicePath.isEmpty()) {
+                networkName = serv->getAPN();
+                if(networkName.isEmpty()) {
+                    networkName = serv->getName();
+                }
+            }
+            cpPriv->roamingSupported = isRoamingAllowed(servicePath);
         } else if (connectionType == "wimax") {
             cpPriv->bearerType = QNetworkConfiguration::BearerWiMAX;
         } else {
             cpPriv->bearerType = QNetworkConfiguration::BearerUnknown;
         }
 
+        cpPriv->name = networkName;
+        cpPriv->isValid = true;
+        cpPriv->id = id;
+        cpPriv->type = QNetworkConfiguration::InternetAccessPoint;
+
         if(serv->getSecurity() == "none") {
             cpPriv->purpose = QNetworkConfiguration::PublicPurpose;
         } else {
@@ -635,7 +690,6 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
         foundConfigurations.append(cpPriv);
         configInterfaces[cpPriv->id] = device.getInterface();
 
-
         locker.unlock();
         emit configurationAdded(ptr);
         locker.relock();
@@ -646,7 +700,6 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
 void QConnmanEngine::addNetworkConfiguration(const QString &networkPath)
 {
     QMutexLocker locker(&mutex);
-
     if(networkPath.isNull())
         return;
 
@@ -662,10 +715,9 @@ void QConnmanEngine::addNetworkConfiguration(const QString &networkPath)
         id = QString::number(qHash(networkPath));
     } else {
         id = QString::number(qHash(servicePath));
-            serv = new QConnmanServiceInterface(servicePath,this);
-            connect(serv,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
-                    this,SLOT(servicePropertyChangedContext(QString,QString, QDBusVariant)));
-
+        serv = new QConnmanServiceInterface(servicePath,this);
+        connect(serv,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
+                this,SLOT(servicePropertyChangedContext(QString,QString, QDBusVariant)));
     }
 
     if (!id.isEmpty() && !accessPointConfigurations.contains(id)) {
@@ -684,7 +736,6 @@ void QConnmanEngine::addNetworkConfiguration(const QString &networkPath)
         if(networkName.isEmpty())
             networkName = "Hidden Network";
 
-
         QNetworkConfiguration::BearerType bearerType;
 
         if(servicePath.isEmpty()) {
@@ -693,21 +744,14 @@ void QConnmanEngine::addNetworkConfiguration(const QString &networkPath)
             QConnmanDeviceInterface device(devicePath,this);
             bearerType = typeToBearer(device.getType());
         } else {
-            bearerType = typeToBearer(serv->getType());
-        }
-
-        if (bearerType == QNetworkConfiguration::Bearer2G) {
-            QString mode = serv->getMode();
-            if (mode == "gprs" || mode == "edge") {
-                bearerType = QNetworkConfiguration::Bearer2G;
-            } else if (mode == "umts") {
-                bearerType = QNetworkConfiguration::BearerWCDMA;
-            }
-            if(servicePath.isEmpty()) {
-                networkName = serv->getAPN();
-                if(networkName.isEmpty()) {
+            if(serv->getType() == "cellular") {
+                bearerType = ofonoTechToBearerType("cellular");
+                if(servicePath.isEmpty()) {
                     networkName = serv->getName();
                 }
+                cpPriv->roamingSupported = isRoamingAllowed(servicePath);
+            } else {
+                bearerType = typeToBearer(serv->getType());
             }
         }
 
@@ -775,7 +819,19 @@ void QConnmanConnectThread::run()
     if(!serv.isValid()) {
         emit connectionError(identifier, QBearerEngineImpl::InterfaceLookupError);
     } else {
-        serv.connect();
+        if(serv.getType() != "cellular") {
+            serv.connect();
+        } else {
+            QOfonoManagerInterface ofonoManager(0);
+            QString modemPath = ofonoManager.currentModem().path();
+            QOfonoDataConnectionManagerInterface dc(modemPath,0);
+            foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) {
+                if(dcPath.path().contains(servicePath.section("_",-1))) {
+                    QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0);
+                    primaryContext.setActive(true);
+                }
+            }
+        }
     }
 }
 
diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h
index 2ee6da531c..569bbc7a73 100644
--- a/src/plugins/bearer/connman/qconnmanengine.h
+++ b/src/plugins/bearer/connman/qconnmanengine.h
@@ -137,7 +137,8 @@ private:
     QMap<QString,QStringList> deviceMap; //tech path,  device path
     QMap<QString, QString> serviceNetworks; //service, network
 
-
+    QNetworkConfiguration::BearerType ofonoTechToBearerType(const QString &type);
+    bool isRoamingAllowed(const QString &context);
 protected:
     bool requiresPolling() const;
     QConnmanConnectThread *connThread;
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 3722c43287..549a07a7a1 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -984,12 +984,17 @@ QConnmanCounterInterface::~QConnmanCounterInterface()
 
 quint32 QConnmanCounterInterface::getReceivedByteCount()
 {
-return 0;
+    return 0;
 }
 
 quint32 QConnmanCounterInterface::getTransmittedByteCount()
 {
-return 0;
+    return 0;
+}
+
+quint64 QConnmanCounterInterface::getTimeOnline()
+{
+    return 0;
 }
 
 /////////////////////////////////////////
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
index a2b1e7338d..6e6b7020a7 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h
+++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
@@ -331,6 +331,7 @@ public:
     QString getInterface();
     quint32 getReceivedByteCount();
     quint32 getTransmittedByteCount();
+    quint64 getTimeOnline();
 
 private:
     QConnmanCounterInterfacePrivate *d;
diff --git a/src/plugins/bearer/connman/qofonoservice_linux.cpp b/src/plugins/bearer/connman/qofonoservice_linux.cpp
new file mode 100644
index 0000000000..955f4b13c6
--- /dev/null
+++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp
@@ -0,0 +1,940 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QObject>
+#include <QList>
+#include <QtDBus/QtDBus>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusError>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusReply>
+#include <QtDBus/QDBusPendingCallWatcher>
+#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/QDBusPendingCall>
+
+#include "qofonoservice_linux_p.h"
+
+
+QT_BEGIN_NAMESPACE
+static QDBusConnection dbusConnection = QDBusConnection::systemBus();
+
+
+QOfonoManagerInterface::QOfonoManagerInterface( QObject *parent)
+        : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                                 QLatin1String(OFONO_MANAGER_PATH),
+                                 OFONO_MANAGER_INTERFACE,
+                                 QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoManagerInterface::~QOfonoManagerInterface()
+{
+}
+
+QList <QDBusObjectPath> QOfonoManagerInterface::getModems()
+{
+    QVariant var = getProperty("Modems");
+    return qdbus_cast<QList<QDBusObjectPath> >(var);
+}
+
+QDBusObjectPath QOfonoManagerInterface::currentModem()
+{
+    QList<QDBusObjectPath> modems = getModems();
+    foreach(const QDBusObjectPath modem, modems) {
+        QOfonoModemInterface device(modem.path());
+        if(device.isPowered() && device.isOnline())
+        return modem;;
+    }
+    return QDBusObjectPath();
+}
+
+
+void QOfonoManagerInterface::connectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                               QLatin1String(OFONO_MANAGER_PATH),
+                               QLatin1String(OFONO_MANAGER_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+        QOfonoDBusHelper *helper;
+        helper = new QOfonoDBusHelper(this);
+
+        dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                               QLatin1String(OFONO_MANAGER_PATH),
+                               QLatin1String(OFONO_MANAGER_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+        QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+    }
+}
+
+void QOfonoManagerInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariant QOfonoManagerInterface::getProperty(const QString &property)
+{
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        return map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return QVariant();
+}
+
+QVariantMap QOfonoManagerInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply = this->call(QLatin1String("GetProperties"));
+    if(reply.isValid())
+        return reply.value();
+    else
+        return QVariantMap();
+}
+
+QOfonoDBusHelper::QOfonoDBusHelper(QObject * parent)
+        : QObject(parent)
+{
+}
+
+QOfonoDBusHelper::~QOfonoDBusHelper()
+{
+}
+
+void QOfonoDBusHelper::propertyChanged(const QString &item, const QDBusVariant &var)
+{
+    QDBusMessage msg = this->message();
+    Q_EMIT propertyChangedContext(msg.path() ,item, var);
+}
+
+
+QOfonoModemInterface::QOfonoModemInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_MODEM_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoModemInterface::~QOfonoModemInterface()
+{
+}
+
+bool QOfonoModemInterface::isPowered()
+{
+    QVariant var = getProperty("Powered");
+    return qdbus_cast<bool>(var);
+}
+
+bool QOfonoModemInterface::isOnline()
+{
+    QVariant var = getProperty("Online");
+    return qdbus_cast<bool>(var);
+}
+
+QString QOfonoModemInterface::getName()
+{
+    QVariant var = getProperty("Name");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoModemInterface::getManufacturer()
+{
+    QVariant var = getProperty("Manufacturer");
+    return qdbus_cast<QString>(var);
+
+}
+
+QString QOfonoModemInterface::getModel()
+{
+
+    QVariant var = getProperty("Model");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoModemInterface::getRevision()
+{
+    QVariant var = getProperty("Revision");
+    return qdbus_cast<QString>(var);
+
+}
+QString QOfonoModemInterface::getSerial()
+{
+    QVariant var = getProperty("Serial");
+    return qdbus_cast<QString>(var);
+
+}
+
+QStringList QOfonoModemInterface::getFeatures()
+{
+    //sms, sim
+    QVariant var = getProperty("Features");
+    return qdbus_cast<QStringList>(var);
+}
+
+QStringList QOfonoModemInterface::getInterfaces()
+{
+    QVariant var = getProperty("Interfaces");
+    return qdbus_cast<QStringList>(var);
+}
+
+QString QOfonoModemInterface::defaultInterface()
+{
+    foreach(const QString &modem,getInterfaces()) {
+     return modem;
+    }
+    return QString();
+}
+
+
+void QOfonoModemInterface::connectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+            if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                                   this->path(),
+                                   QLatin1String(OFONO_MODEM_INTERFACE),
+                                   QLatin1String("PropertyChanged"),
+                                   this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+                qWarning() << "PropertyCHanged not connected";
+            }
+        }
+
+        if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+            QOfonoDBusHelper *helper;
+            helper = new QOfonoDBusHelper(this);
+
+            dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                                   this->path(),
+                                   QLatin1String(OFONO_MODEM_INTERFACE),
+                                   QLatin1String("PropertyChanged"),
+                                   helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+            QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                    this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+        }}
+
+void QOfonoModemInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariantMap QOfonoModemInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply = this->call(QLatin1String("GetProperties"));
+    return reply.value();
+}
+
+QVariant QOfonoModemInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        var = map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return var;
+}
+
+
+QOfonoNetworkRegistrationInterface::QOfonoNetworkRegistrationInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_NETWORK_REGISTRATION_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoNetworkRegistrationInterface::~QOfonoNetworkRegistrationInterface()
+{
+}
+
+QString QOfonoNetworkRegistrationInterface::getStatus()
+{
+    /*
+                "unregistered"  Not registered to any network
+                "registered"    Registered to home network
+                "searching"     Not registered, but searching
+                "denied"        Registration has been denied
+                "unknown"       Status is unknown
+                "roaming"       Registered, but roaming*/
+    QVariant var = getProperty("Status");
+    return qdbus_cast<QString>(var);
+}
+
+quint16 QOfonoNetworkRegistrationInterface::getLac()
+{
+    QVariant var = getProperty("LocationAreaCode");
+    return var.value<quint16>();
+}
+
+
+quint32 QOfonoNetworkRegistrationInterface::getCellId()
+{
+    QVariant var = getProperty("CellId");
+    return var.value<quint32>();
+}
+
+QString QOfonoNetworkRegistrationInterface::getTechnology()
+{
+    // "gsm", "edge", "umts", "hspa","lte"
+    QVariant var = getProperty("Technology");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoNetworkRegistrationInterface::getOperatorName()
+{
+    QVariant var = getProperty("Name");
+    return qdbus_cast<QString>(var);
+}
+
+int QOfonoNetworkRegistrationInterface::getSignalStrength()
+{
+    QVariant var = getProperty("Strength");
+    return qdbus_cast<int>(var);
+
+}
+
+QString QOfonoNetworkRegistrationInterface::getBaseStation()
+{
+    QVariant var = getProperty("BaseStation");
+    return qdbus_cast<QString>(var);
+}
+
+QList <QDBusObjectPath> QOfonoNetworkRegistrationInterface::getOperators()
+{
+    QVariant var = getProperty("Operators");
+    return qdbus_cast<QList <QDBusObjectPath> >(var);
+}
+
+void QOfonoNetworkRegistrationInterface::connectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+        QOfonoDBusHelper *helper;
+        helper = new QOfonoDBusHelper(this);
+
+        dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+        QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+    }
+}
+
+void QOfonoNetworkRegistrationInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariant QOfonoNetworkRegistrationInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        var = map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return var;
+}
+
+QVariantMap QOfonoNetworkRegistrationInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply =  this->call(QLatin1String("GetProperties"));
+    return reply.value();
+}
+
+
+
+QOfonoNetworkOperatorInterface::QOfonoNetworkOperatorInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_NETWORK_OPERATOR_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoNetworkOperatorInterface::~QOfonoNetworkOperatorInterface()
+{
+}
+
+QString QOfonoNetworkOperatorInterface::getName()
+{
+    QVariant var = getProperty("Name");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoNetworkOperatorInterface::getStatus()
+{
+    // "unknown", "available", "current" and "forbidden"
+    QVariant var = getProperty("Status");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoNetworkOperatorInterface::getMcc()
+{
+    QVariant var = getProperty("MobileCountryCode");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoNetworkOperatorInterface::getMnc()
+{
+    QVariant var = getProperty("MobileNetworkCode");
+    return qdbus_cast<QString>(var);
+}
+
+QStringList QOfonoNetworkOperatorInterface::getTechnologies()
+{
+    QVariant var = getProperty("Technologies");
+    return qdbus_cast<QStringList>(var);
+}
+
+void QOfonoNetworkOperatorInterface::connectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+        QOfonoDBusHelper *helper;
+        helper = new QOfonoDBusHelper(this);
+
+        dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+        QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+    }
+}
+
+void QOfonoNetworkOperatorInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariant QOfonoNetworkOperatorInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        var = map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return var;
+}
+
+QVariantMap QOfonoNetworkOperatorInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply =  this->call(QLatin1String("GetProperties"));
+    return reply.value();
+}
+
+QOfonoSimInterface::QOfonoSimInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_SIM_MANAGER_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoSimInterface::~QOfonoSimInterface()
+{
+}
+
+bool QOfonoSimInterface::isPresent()
+{
+    QVariant var = getProperty("Present");
+    return qdbus_cast<bool>(var);
+}
+
+QString QOfonoSimInterface::getHomeMcc()
+{
+    QVariant var = getProperty("MobileCountryCode");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoSimInterface::getHomeMnc()
+{
+    QVariant var = getProperty("MobileNetworkCode");
+    return qdbus_cast<QString>(var);
+}
+
+//    QStringList subscriberNumbers();
+//    QMap<QString,QString> serviceNumbers();
+QString QOfonoSimInterface::pinRequired()
+{
+    QVariant var = getProperty("PinRequired");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoSimInterface::lockedPins()
+{
+    QVariant var = getProperty("LockedPins");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoSimInterface::cardIdentifier()
+{
+    QVariant var = getProperty("CardIdentifier");
+    return qdbus_cast<QString>(var);
+}
+
+void QOfonoSimInterface::connectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_SIM_MANAGER_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+        QOfonoDBusHelper *helper;
+        helper = new QOfonoDBusHelper(this);
+
+        dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_SIM_MANAGER_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+        QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+    }
+}
+
+void QOfonoSimInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariant QOfonoSimInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        var = map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return var;
+}
+
+QVariantMap QOfonoSimInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply =  this->call(QLatin1String("GetProperties"));
+    return reply.value();
+}
+
+QOfonoDataConnectionManagerInterface::QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_DATA_CONNECTION_MANAGER_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoDataConnectionManagerInterface::~QOfonoDataConnectionManagerInterface()
+{
+}
+
+QList<QDBusObjectPath> QOfonoDataConnectionManagerInterface::getPrimaryContexts()
+{
+    QVariant var = getProperty("PrimaryContexts");
+    return qdbus_cast<QList<QDBusObjectPath> >(var);
+}
+
+bool QOfonoDataConnectionManagerInterface::isAttached()
+{
+    QVariant var = getProperty("Attached");
+    return qdbus_cast<bool>(var);
+}
+
+bool QOfonoDataConnectionManagerInterface::isRoamingAllowed()
+{
+    QVariant var = getProperty("RoamingAllowed");
+    return qdbus_cast<bool>(var);
+}
+
+bool QOfonoDataConnectionManagerInterface::isPowered()
+{
+    QVariant var = getProperty("Powered");
+    return qdbus_cast<bool>(var);
+}
+
+void QOfonoDataConnectionManagerInterface::connectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+        QOfonoDBusHelper *helper;
+        helper = new QOfonoDBusHelper(this);
+
+        dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+        QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+    }
+}
+
+void QOfonoDataConnectionManagerInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariant QOfonoDataConnectionManagerInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        var = map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return var;
+}
+
+QVariantMap QOfonoDataConnectionManagerInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply =  this->call(QLatin1String("GetProperties"));
+    return reply.value();
+}
+
+QOfonoPrimaryDataContextInterface::QOfonoPrimaryDataContextInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_DATA_CONTEXT_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoPrimaryDataContextInterface::~QOfonoPrimaryDataContextInterface()
+{
+}
+
+bool QOfonoPrimaryDataContextInterface::isActive()
+{
+    QVariant var = getProperty("Active");
+    return qdbus_cast<bool>(var);
+}
+
+QString QOfonoPrimaryDataContextInterface::getApName()
+{
+    QVariant var = getProperty("AccessPointName");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoPrimaryDataContextInterface::getType()
+{
+    QVariant var = getProperty("Type");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoPrimaryDataContextInterface::getName()
+{
+    QVariant var = getProperty("Name");
+    return qdbus_cast<QString>(var);
+}
+
+QVariantMap QOfonoPrimaryDataContextInterface::getSettings()
+{
+    QVariant var = getProperty("Settings");
+    return qdbus_cast<QVariantMap>(var);
+}
+
+QString QOfonoPrimaryDataContextInterface::getInterface()
+{
+    QVariant var = getProperty("Interface");
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoPrimaryDataContextInterface::getAddress()
+{
+    QVariant var = getProperty("Address");
+    return qdbus_cast<QString>(var);
+}
+
+bool QOfonoPrimaryDataContextInterface::setActive(bool on)
+{
+//    this->setProperty("Active", QVariant(on));
+
+    return setProp("Active", qVariantFromValue(on));
+}
+
+bool QOfonoPrimaryDataContextInterface::setApn(const QString &name)
+{
+    return setProp("AccessPointName", QVariant::fromValue(name));
+}
+
+void QOfonoPrimaryDataContextInterface::connectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_DATA_CONTEXT_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+        QOfonoDBusHelper *helper;
+        helper = new QOfonoDBusHelper(this);
+
+        dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_DATA_CONTEXT_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+        QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+    }
+}
+
+void QOfonoPrimaryDataContextInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariant QOfonoPrimaryDataContextInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        var = map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return var;
+}
+
+QVariantMap QOfonoPrimaryDataContextInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply =  this->call(QLatin1String("GetProperties"));
+    return reply.value();
+}
+
+bool QOfonoPrimaryDataContextInterface::setProp(const QString &property, const QVariant &var)
+{
+    QList<QVariant> args;
+    args << qVariantFromValue(property) << qVariantFromValue(QDBusVariant(var));
+
+    QDBusMessage reply = this->callWithArgumentList(QDBus::AutoDetect,
+                                                    QLatin1String("SetProperty"),
+                                                    args);
+    bool ok = true;
+    if(reply.type() != QDBusMessage::ReplyMessage) {
+        qWarning() << reply.errorMessage();
+        ok = false;
+    }
+    qWarning() << reply.errorMessage();
+    return ok;
+}
+
+QOfonoSmsInterface::QOfonoSmsInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_SMS_MANAGER_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoSmsInterface::~QOfonoSmsInterface()
+{
+}
+
+void QOfonoSmsInterface::connectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                                 this->path(),
+                                 QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
+                                 QLatin1String("PropertyChanged"),
+                                 this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
+        QOfonoDBusHelper *helper;
+        helper = new QOfonoDBusHelper(this);
+
+        dbusConnection.connect(QLatin1String(OFONO_SERVICE),
+                               this->path(),
+                               QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
+                               QLatin1String("PropertyChanged"),
+                               helper,SLOT(propertyChanged(QString,QDBusVariant)));
+
+
+        QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
+                         this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
+    }
+
+    if (QLatin1String(signal) == SIGNAL(immediateMessage(QString,QVariantMap))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                                 this->path(),
+                                 QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
+                                 QLatin1String("ImmediateMessage"),
+                                 this,SIGNAL(immediateMessage(QString,QVariantMap )))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+
+    if (QLatin1String(signal) == SIGNAL(incomingMessage(QString,QVariantMap))) {
+        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+                                 this->path(),
+                                 QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
+                                 QLatin1String("IncomingMessage"),
+                                 this,SIGNAL(incomingMessage(QString,QVariantMap)))) {
+            qWarning() << "PropertyCHanged not connected";
+        }
+    }
+}
+
+void QOfonoSmsInterface::disconnectNotify(const char *signal)
+{
+    if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) {
+
+    }
+}
+
+QVariant QOfonoSmsInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property)) {
+        var = map.value(property);
+    } else {
+        qDebug() << Q_FUNC_INFO << "does not contain" << property;
+    }
+    return var;
+}
+
+QVariantMap QOfonoSmsInterface::getProperties()
+{
+    QDBusReply<QVariantMap > reply = this->call(QLatin1String("GetProperties"));
+    return reply.value();
+}
+
+void QOfonoSmsInterface::sendMessage(const QString &to, const QString &message)
+{
+    QDBusReply<QString> reply =  this->call(QLatin1String("SendMessage"),
+                                            QVariant::fromValue(to),
+                                            QVariant::fromValue(message));
+    bool ok = true;
+    if(reply.error().type() == QDBusError::InvalidArgs) {
+        qWarning() << reply.error().message();
+        ok = false;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/bearer/connman/qofonoservice_linux_p.h b/src/plugins/bearer/connman/qofonoservice_linux_p.h
new file mode 100644
index 0000000000..48926664e0
--- /dev/null
+++ b/src/plugins/bearer/connman/qofonoservice_linux_p.h
@@ -0,0 +1,332 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOFONOSERVICE_H
+#define QOFONOSERVICE_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtDBus/QtDBus>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusError>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusReply>
+
+#include <QtDBus/QDBusPendingCallWatcher>
+#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/QDBusContext>
+#include <QMap>
+
+#define OFONO_SERVICE	                         "org.ofono"
+#define OFONO_MANAGER_INTERFACE                  "org.ofono.Manager"
+#define OFONO_MANAGER_PATH                       "/"
+#define OFONO_MODEM_INTERFACE                    "org.ofono.Modem"
+#define OFONO_NETWORK_REGISTRATION_INTERFACE     "org.ofono.NetworkRegistration"
+#define OFONO_NETWORK_OPERATOR_INTERFACE         "org.ofono.NetworkOperator"
+#define OFONO_DATA_CONNECTION_MANAGER_INTERFACE  "org.ofono.DataConnectionManager"
+#define OFONO_SIM_MANAGER_INTERFACE              "org.ofono.SimManager"
+#define OFONO_DATA_CONTEXT_INTERFACE             "org.ofono.PrimaryDataContext"
+
+#define OFONO_SMS_MANAGER_INTERFACE              "org.ofono.SmsManager"
+#define OFONO_PHONEBOOK_INTERFACE                "org.ofono.Phonebook"
+#define OFONO_MESSAGE_WAITING_INTERFACE          "org.ofono.MessageWaiting"
+
+
+
+QT_BEGIN_NAMESPACE
+
+QT_END_NAMESPACE
+
+
+QT_BEGIN_NAMESPACE
+
+class QOfonoManagerInterface : public  QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoManagerInterface( QObject *parent = 0);
+    ~QOfonoManagerInterface();
+
+     QDBusObjectPath path() const;
+
+    QVariantMap getProperties();
+    bool setProperty(const QString &name, const QDBusVariant &value);
+    QList <QDBusObjectPath> getModems();
+    QDBusObjectPath currentModem();
+
+Q_SIGNALS:
+    void propertyChanged(const QString &, const QDBusVariant &value);
+    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+
+};
+
+
+class QOfonoDBusHelper: public QObject, protected QDBusContext
+ {
+     Q_OBJECT
+ public:
+    QOfonoDBusHelper(QObject *parent = 0);
+    ~QOfonoDBusHelper();
+
+ public slots:
+    void propertyChanged(const QString &, const QDBusVariant &);
+ Q_SIGNALS:
+    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
+};
+
+class QOfonoModemInterface : public QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoModemInterface(const QString &dbusModemPathName, QObject *parent = 0);
+    ~QOfonoModemInterface();
+
+    QVariantMap getProperties();
+    //properties
+    bool isPowered();
+    bool isOnline();
+    QString getName();
+    QString getManufacturer();
+    QString getModel();
+    QString getRevision();
+    QString getSerial();
+
+    QStringList getFeatures(); //sms, sim
+    QStringList getInterfaces();
+    QString defaultInterface();
+
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+Q_SIGNALS:
+    void propertyChanged(const QString &, const QDBusVariant &value);
+    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
+};
+
+
+class QOfonoNetworkRegistrationInterface : public QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoNetworkRegistrationInterface(const QString &dbusModemPathName, QObject *parent = 0);
+    ~QOfonoNetworkRegistrationInterface();
+
+    QVariantMap getProperties();
+
+    //properties
+    QString getStatus();
+    quint16 getLac();
+    quint32 getCellId();
+    QString getTechnology();
+    QString getOperatorName();
+    int getSignalStrength();
+    QString getBaseStation();
+    QList <QDBusObjectPath> getOperators();
+
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+Q_SIGNALS:
+    void propertyChanged(const QString &, const QDBusVariant &value);
+    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
+
+};
+
+class QOfonoNetworkOperatorInterface : public QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+//modem or operator paths
+    QOfonoNetworkOperatorInterface(const QString &dbusPathName, QObject *parent = 0);
+    ~QOfonoNetworkOperatorInterface();
+
+    QVariantMap getProperties();
+
+    //properties
+    QString getName();
+    QString getStatus();// "unknown", "available", "current" and "forbidden"
+    QString getMcc();
+    QString getMnc();
+    QStringList getTechnologies();
+
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+};
+
+class QOfonoSimInterface : public QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoSimInterface(const QString &dbusModemPathName, QObject *parent = 0);
+    ~QOfonoSimInterface();
+
+    QVariantMap getProperties();
+
+    //properties
+    bool isPresent();
+    QString getHomeMcc();
+    QString getHomeMnc();
+//    QStringList subscriberNumbers();
+//    QMap<QString,QString> serviceNumbers();
+    QString pinRequired();
+    QString lockedPins();
+    QString cardIdentifier();
+
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+};
+
+
+class QOfonoDataConnectionManagerInterface : public QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent = 0);
+    ~QOfonoDataConnectionManagerInterface();
+
+    QVariantMap getProperties();
+
+    //properties
+    QList<QDBusObjectPath> getPrimaryContexts();
+    bool isAttached();
+    bool isRoamingAllowed();
+    bool isPowered();
+
+    bool setPower(bool on);
+
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+};
+
+
+class QOfonoPrimaryDataContextInterface : public QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoPrimaryDataContextInterface(const QString &dbusPathName, QObject *parent = 0);
+    ~QOfonoPrimaryDataContextInterface();
+
+    QVariantMap getProperties();
+
+    //properties
+    bool isActive();
+    QString getApName();
+    QString getType();
+    QString getName();
+    QVariantMap getSettings();
+    QString getInterface();
+    QString getAddress();
+
+    bool setActive(bool on);
+    bool setApn(const QString &name);
+
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+    bool setProp(const QString &, const QVariant &var);
+};
+
+class QOfonoSmsInterface : public QDBusAbstractInterface
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoSmsInterface(const QString &dbusModemPathName, QObject *parent = 0);
+    ~QOfonoSmsInterface();
+
+    QVariantMap getProperties();
+    void sendMessage(const QString &to, const QString &message);
+
+    //properties
+    QString  serviceCenterAddress();
+    bool useDeliveryReports();
+    QString bearer();
+
+protected:
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+    QVariant getProperty(const QString &);
+
+Q_SIGNALS:
+    void propertyChanged(const QString &, const QDBusVariant &value);
+    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
+    void immediateMessage(const QString &message, const QVariantMap &info);
+    void incomingMessage(const QString &message, const QVariantMap &info);
+};
+
+#endif //QOFONOSERVICE_H
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 131f36d39e..844e38b103 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -305,50 +305,53 @@ void QScanThread::getUserConfigurations()
         SCDynamicStoreRef dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, (CFStringRef)@"Qt corewlan", nil, nil);
         NSDictionary * airportPlist = (NSDictionary *)SCDynamicStoreCopyValue(dynRef, (CFStringRef)[NSString stringWithFormat:@"Setup:/Network/Interface/%@/AirPort", nsInterfaceName]);
         CFRelease(dynRef);
-
-        NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"];
-
-        NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"];
-        for(NSString *ssidkey in thisSsidarray) {
-            QString thisSsid = qt_mac_NSStringToQString(ssidkey);
-            if(!userProfiles.contains(thisSsid)) {
-                QMap <QString,QString> map;
-                map.insert(thisSsid, qt_mac_NSStringToQString(nsInterfaceName));
-                userProfiles.insert(thisSsid, map);
+        if(airportPlist != nil) {
+            NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"];
+
+            NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"];
+            for(NSString *ssidkey in thisSsidarray) {
+                QString thisSsid = qt_mac_NSStringToQString(ssidkey);
+                if(!userProfiles.contains(thisSsid)) {
+                    QMap <QString,QString> map;
+                    map.insert(thisSsid, qt_mac_NSStringToQString(nsInterfaceName));
+                    userProfiles.insert(thisSsid, map);
+                }
             }
+            CFRelease(airportPlist);
         }
-        CFRelease(airportPlist);
 
         // 802.1X user profiles
         QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist";
         NSDictionary* eapDict = [[[NSDictionary alloc] initWithContentsOfFile:qt_mac_QStringToNSString(userProfilePath)] autorelease];
-        NSString *profileStr= @"Profiles";
-        NSString *nameStr = @"UserDefinedName";
-        NSString *networkSsidStr = @"Wireless Network";
-        for (id profileKey in eapDict) {
-            if ([profileStr isEqualToString:profileKey]) {
-                NSDictionary *itemDict = [eapDict objectForKey:profileKey];
-                for (id itemKey in itemDict) {
-
-                    NSInteger dictSize = [itemKey count];
-                    id objects[dictSize];
-                    id keys[dictSize];
-
-                    [itemKey getObjects:objects andKeys:keys];
-                    QString networkName;
-                    QString ssid;
-                    for(int i = 0; i < dictSize; i++) {
-                        if([nameStr isEqualToString:keys[i]]) {
-                            networkName = qt_mac_NSStringToQString(objects[i]);
-                        }
-                        if([networkSsidStr isEqualToString:keys[i]]) {
-                            ssid = qt_mac_NSStringToQString(objects[i]);
-                        }
-                        if(!userProfiles.contains(networkName)
-                            && !ssid.isEmpty()) {
-                            QMap<QString,QString> map;
-                            map.insert(ssid, qt_mac_NSStringToQString(nsInterfaceName));
-                            userProfiles.insert(networkName, map);
+        if(eapDict != nil) {
+            NSString *profileStr= @"Profiles";
+            NSString *nameStr = @"UserDefinedName";
+            NSString *networkSsidStr = @"Wireless Network";
+            for (id profileKey in eapDict) {
+                if ([profileStr isEqualToString:profileKey]) {
+                    NSDictionary *itemDict = [eapDict objectForKey:profileKey];
+                    for (id itemKey in itemDict) {
+
+                        NSInteger dictSize = [itemKey count];
+                        id objects[dictSize];
+                        id keys[dictSize];
+
+                        [itemKey getObjects:objects andKeys:keys];
+                        QString networkName;
+                        QString ssid;
+                        for(int i = 0; i < dictSize; i++) {
+                            if([nameStr isEqualToString:keys[i]]) {
+                                networkName = qt_mac_NSStringToQString(objects[i]);
+                            }
+                            if([networkSsidStr isEqualToString:keys[i]]) {
+                                ssid = qt_mac_NSStringToQString(objects[i]);
+                            }
+                            if(!userProfiles.contains(networkName)
+                                && !ssid.isEmpty()) {
+                                QMap<QString,QString> map;
+                                map.insert(ssid, qt_mac_NSStringToQString(nsInterfaceName));
+                                userProfiles.insert(networkName, map);
+                            }
                         }
                     }
                 }
@@ -855,6 +858,8 @@ quint64 QCoreWlanEngine::startTime(const QString &id)
 
     NSString *filePath = @"/Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist";
     NSDictionary* plistDict = [[[NSDictionary alloc] initWithContentsOfFile:filePath] autorelease];
+    if(plistDict == nil)
+        return timestamp;
     NSString *input = @"KnownNetworks";
     NSString *timeStampStr = @"_timeStamp";
 
@@ -864,9 +869,13 @@ quint64 QCoreWlanEngine::startTime(const QString &id)
         if ([input isEqualToString:key]) {
 
             NSDictionary *knownNetworksDict = [plistDict objectForKey:key];
+            if(knownNetworksDict == nil)
+                return timestamp;
             for (id networkKey in knownNetworksDict) {
                 bool isFound = false;
                 NSDictionary *itemDict = [knownNetworksDict objectForKey:networkKey];
+                if(itemDict == nil)
+                    return timestamp;
                 NSInteger dictSize = [itemDict count];
                 id objects[dictSize];
                 id keys[dictSize];
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 19f13c25e9..7f81397dba 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -111,13 +111,15 @@ QNetworkSessionPrivateImpl::~QNetworkSessionPrivateImpl()
     Cancel();
     iSocketServ.Close();
 
-    // Restore default interface to system default
-    restoreDefaultIf();
+    // Close global 'Open C' RConnection
+    // Clears also possible unsetdefaultif() flags.
+    setdefaultif(0);
 
     iConnectionMonitor.Close();
     iOpenCLibrary.Close();
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
-    qDebug() << "QNS this : " << QString::number((uint)this) << " - destroyed (and restoreDefaultIf())";
+    qDebug() << "QNS this : " << QString::number((uint)this)
+             << " - destroyed (and setdefaultif(0))";
 #endif
 }
 
@@ -533,8 +535,15 @@ void QNetworkSessionPrivateImpl::close(bool allowSignals)
     Cancel(); // closes iConnection
     iSocketServ.Close();
 
-    // Restore default interface to system default
-    restoreDefaultIf();
+    // Close global 'Open C' RConnection. If OpenC supports,
+    // close the defaultif for good to avoid difficult timing
+    // and bouncing issues of network going immediately back up
+    //  because of e.g. select() thread etc.
+    if (iDynamicUnSetdefaultif) {
+        iDynamicUnSetdefaultif();
+    } else {
+        setdefaultif(0);
+    }
 
     // If UserChoice, go down immediately. If some other configuration,
     // go down immediately if there is no reports expected from the platform;
@@ -959,11 +968,17 @@ QNetworkConfiguration QNetworkSessionPrivateImpl::activeConfiguration(TUint32 ia
             }
         } else {
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-            // On Symbian^3 (only, not earlier or Symbian^4) if the SNAP was not reachable, it triggers
-            // user choice type of activity (EasyWLAN). As a result, a new IAP may be created, and
-            // hence if was not found yet. Therefore update configurations and see if there is something new.
+            // On Symbian^3 (only, not earlier or Symbian^4) if the SNAP was not reachable, it
+            // triggers user choice type of activity (EasyWLAN). As a result, a new IAP may be
+            // created, and hence if was not found yet. Therefore update configurations and see if
+            // there is something new.
+
             // 1. Update knowledge from the databases.
-            engine->requestUpdate();
+            if (thread() != engine->thread())
+                QMetaObject::invokeMethod(engine, "requestUpdate", Qt::BlockingQueuedConnection);
+            else
+                engine->requestUpdate();
+
             // 2. Check if new configuration was created during connection creation
             QList<QString> knownConfigs = engine->accessPointConfigurationIdentifiers();
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
@@ -1016,7 +1031,12 @@ QNetworkConfiguration QNetworkSessionPrivateImpl::activeConfiguration(TUint32 ia
             } else {
                 // Check if new (WLAN) IAP was created in IAP/SNAP dialog
                 // 1. Sync internal configurations array to commsdb first
-                engine->updateConfigurations();
+                if (thread() != engine->thread()) {
+                    QMetaObject::invokeMethod(engine, "requestUpdate",
+                                              Qt::BlockingQueuedConnection);
+                } else {
+                    engine->requestUpdate();
+                }
                 // 2. Check if new configuration was created during connection creation
                 QStringList knownConfigs = engine->accessPointConfigurationIdentifiers();
                 if (knownConfigs.count() > iKnownConfigsBeforeConnectionStart.count()) {
@@ -1459,29 +1479,6 @@ void QNetworkSessionPrivateImpl::handleSymbianConnectionStatusChange(TInt aConne
         }
 }
 
-void QNetworkSessionPrivateImpl::restoreDefaultIf()
-{
-    QNetworkConfigurationPrivatePointer config = engine->defaultConfiguration();
-
-    QMutexLocker locker(&config->mutex);
-
-    ifreq ifr;
-    memset(&ifr, 0, sizeof(ifreq));
-
-    switch (config->type) {
-    case QNetworkConfiguration::InternetAccessPoint:
-        strcpy(ifr.ifr_name, config->name.toUtf8().constData());
-        break;
-    case QNetworkConfiguration::ServiceNetwork:
-        ifr.ifr_ifru.snap_id = toSymbianConfig(config)->numericId;
-        break;
-    default:
-        ;
-    };
-
-    setdefaultif(&ifr);
-}
-
 #if defined(SNAP_FUNCTIONALITY_AVAILABLE)
 bool QNetworkSessionPrivateImpl::easyWlanTrueIapId(TUint32 &trueIapId) const
 {
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 51f2e707c7..8e3e9976fd 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -141,7 +141,6 @@ private:
     void handleSymbianConnectionStatusChange(TInt aConnectionStatus, TInt aError, TUint accessPointId = 0);
     QNetworkConfiguration bestConfigFromSNAP(const QNetworkConfiguration& snapConfig) const;
     QNetworkConfiguration activeConfiguration(TUint32 iapId = 0) const;
-    void restoreDefaultIf();
 #ifndef QT_NO_NETWORKINTERFACE
     QNetworkInterface interface(TUint iapId) const;
 #endif
diff --git a/src/script/script.pro b/src/script/script.pro
index 55217e0024..4ee86d7bb1 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -79,7 +79,10 @@ INCLUDEPATH += $$PWD
 
 include(script.pri)
 
-symbian:TARGET.UID3=0x2001B2E1
+symbian {
+    TARGET.UID3=0x2001B2E1
+    LIBS += -lhal
+}
 
 # WebKit doesn't compile in C++0x mode
 *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.0.png b/tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.0.png
new file mode 100644
index 0000000000..16adc514df
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.0.png
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.qml b/tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.qml
new file mode 100644
index 0000000000..0cc98ce8c3
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.qml
@@ -0,0 +1,447 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 32
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 48
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 64
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 80
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 96
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 112
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 128
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 144
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 160
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 176
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 192
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 208
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 224
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 240
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 256
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 272
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 288
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 304
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 320
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 336
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 352
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 368
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 384
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 400
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 416
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 432
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 448
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 464
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 480
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 496
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 220; y: 270
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 512
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 528
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 544
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 560
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 576
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 220; y: 271
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 220; y: 271
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 592
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+    Frame {
+        msec: 608
+        hash: "96e8e81d61bffe02b8f41f47a4a7e8fc"
+    }
+    Frame {
+        msec: 624
+        hash: "75881a2779bd7d7f683f87c4a7393769"
+    }
+    Frame {
+        msec: 640
+        hash: "2ef628328d2a6393095e78db80b0513f"
+    }
+    Frame {
+        msec: 656
+        hash: "390926f2c2c27dfa10c9b393ee466ce6"
+    }
+    Frame {
+        msec: 672
+        hash: "ea07d93e7d8a53f56cff19d9d3b282a4"
+    }
+    Frame {
+        msec: 688
+        hash: "8aa6be919b1ef4b7e102a319a453707e"
+    }
+    Frame {
+        msec: 704
+        hash: "6ebc518fb53ffe42fca20b9f16a21b36"
+    }
+    Frame {
+        msec: 720
+        hash: "ee7a93b157e24e22efa84604e7e44fe6"
+    }
+    Frame {
+        msec: 736
+        hash: "de3bf8f67e51b036db4976fd3b4b6c3c"
+    }
+    Frame {
+        msec: 752
+        hash: "648be4298ebe3bbc7e5c4a4c9c46f193"
+    }
+    Frame {
+        msec: 768
+        hash: "1ccf3b73e22a4b98ce1df098af9466f2"
+    }
+    Frame {
+        msec: 784
+        hash: "73a2fb047728b2b8e613f0fb8dfe429d"
+    }
+    Frame {
+        msec: 800
+        hash: "bbb4cabec4b98ea8ca94dff91a0d8c99"
+    }
+    Frame {
+        msec: 816
+        hash: "3337e86bd9fcfbce939389928fb1fb72"
+    }
+    Frame {
+        msec: 832
+        hash: "cb4a2a330e8470c61de9e9b6d2dc4597"
+    }
+    Frame {
+        msec: 848
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 864
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 880
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 896
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 912
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 928
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 944
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 960
+        image: "qtbug13398.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 992
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1008
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1024
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1040
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1056
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1072
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1088
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1104
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1120
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1136
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1152
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1168
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1184
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1200
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1216
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1232
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 220; y: 271
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1248
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1264
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1280
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1296
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1312
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1328
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 220; y: 271
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1344
+        hash: "e09a359578935b988ac1cc8c40b25547"
+    }
+    Frame {
+        msec: 1360
+        hash: "697a4fd182ff90cd557f224174bad43a"
+    }
+    Frame {
+        msec: 1376
+        hash: "99e5ca9a77df1acfed628f31b9050179"
+    }
+    Frame {
+        msec: 1392
+        hash: "1f0dc00d3e3536b40a6becf775b31cee"
+    }
+    Frame {
+        msec: 1408
+        hash: "5b81ddd35d74be222bc8a40d2573884b"
+    }
+    Frame {
+        msec: 1424
+        hash: "4e236f5de69048e87add0e4380f2c3e6"
+    }
+    Frame {
+        msec: 1440
+        hash: "a901c9c0c77e03d98a2b95267cca8514"
+    }
+    Frame {
+        msec: 1456
+        hash: "78bbdf6781c2968c67982ffdb747dbbe"
+    }
+    Frame {
+        msec: 1472
+        hash: "a245ca593649f60980be982eb8fda57e"
+    }
+    Frame {
+        msec: 1488
+        hash: "c27fddc147749da24eaeb92aeaf61738"
+    }
+    Frame {
+        msec: 1504
+        hash: "b9674af46b618dc1eedabd4f18253b11"
+    }
+    Frame {
+        msec: 1520
+        hash: "8ae3c0cc0888fd0a607bc5b537a9ce0a"
+    }
+    Frame {
+        msec: 1536
+        hash: "f1981bd3fb08233622a4078e2f717011"
+    }
+    Frame {
+        msec: 1552
+        hash: "4dce834c9e3988fe535391fedc942add"
+    }
+    Frame {
+        msec: 1568
+        hash: "ca7356dee61e156d04b0b46ea033498e"
+    }
+    Frame {
+        msec: 1584
+        hash: "97499f6e04cbe690bc12458aef4b66a5"
+    }
+    Frame {
+        msec: 1600
+        hash: "2452007928bf86b9c42e666c7a7afc89"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml b/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml
new file mode 100644
index 0000000000..8f388bc85a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml
@@ -0,0 +1,68 @@
+import Qt 4.7
+
+Item {
+    width: 300
+    height: 400
+
+    Rectangle {
+        id: root
+        color: "darkkhaki"
+
+        x: 50
+        y: 50
+
+        width: 200
+        height: 300
+
+        Rectangle {
+            id: statusbar
+            color: "chocolate"
+
+            height: 30
+
+            anchors.top: root.top
+            anchors.left: root.left
+            anchors.right: root.right
+        }
+
+        Rectangle {
+            id: titlebar
+            color: "crimson"
+
+            height: 60
+
+            anchors.top: statusbar.bottom
+            anchors.left: root.left
+            anchors.right: root.right
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                root.state = root.state ? "" : "fullscreen";
+            }
+        }
+
+        states: [
+            State {
+                name: "fullscreen"
+                AnchorChanges {
+                    target: statusbar
+                    anchors.top: undefined
+                    anchors.bottom: titlebar.top
+                }
+                AnchorChanges {
+                    target: titlebar
+                    anchors.top: undefined
+                    anchors.bottom: root.top
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                AnchorAnimation { }
+            }
+        ]
+    }
+}
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 820e32d11f..370bd1314f 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -194,6 +194,7 @@ private slots:
     void task_199967();
     void task_240612();
     void taskQTBUG_6962();
+    void taskQTBUG_8701();
 
 #ifdef QT3_SUPPORT
     void dirPath();
@@ -3912,5 +3913,17 @@ void tst_QUrl::taskQTBUG_6962()
     QCOMPARE(url.authority(), QString());
 }
 
+void tst_QUrl::taskQTBUG_8701()
+{
+    //bug 8701: foo:///bar mangled to foo:/bar
+    QString foo_triple_bar("foo:///bar"), foo_uni_bar("foo:/bar");
+
+    QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar).toString());
+    QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar).toString());
+
+    QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar, QUrl::StrictMode).toString()); // fails
+    QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar, QUrl::StrictMode).toString());
+}
+
 QTEST_MAIN(tst_QUrl)
 #include "tst_qurl.moc"
diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp
index 02507ae172..bb86bfe411 100644
--- a/tools/assistant/tools/assistant/main.cpp
+++ b/tools/assistant/tools/assistant/main.cpp
@@ -316,6 +316,7 @@ int main(int argc, char *argv[])
     TRACE_OBJ
     QApplication a(argc, argv, useGui(argc, argv));
     a.addLibraryPath(a.applicationDirPath() + QLatin1String("/plugins"));
+    setupTranslations();
 
     // Parse arguments.
     CmdLineParser cmd(a.arguments());
@@ -419,8 +420,6 @@ int main(int argc, char *argv[])
         cachedCollection.setCurrentFilter(cmd.currentFilter());
     }
 
-    setupTranslations();
-
     /*
      * We need to be careful here: The main window has to be deleted before
      * the help engine wrapper, which has to be deleted before the
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 09da581f67..0d0729be90 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -381,6 +381,7 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "INCREDIBUILD_XGE" ] = "auto";
     dictionary[ "LTCG" ]            = "no";
     dictionary[ "NATIVE_GESTURES" ] = "yes";
+    dictionary[ "MSVC_MP" ] = "no";
 }
 
 Configure::~Configure()
@@ -534,6 +535,13 @@ void Configure::parseCmdLine()
         else if (configCmdLine.at(i) == "-no-ltcg") {
             dictionary[ "LTCG" ] = "no";
         }
+        else if (configCmdLine.at(i) == "-mp") {
+            dictionary[ "MSVC_MP" ] = "yes";
+        }
+        else if (configCmdLine.at(i) == "-no-mp") {
+            dictionary[ "MSVC_MP" ] = "no";
+        }
+
 #endif
 
         else if (configCmdLine.at(i) == "-platform") {
@@ -1509,6 +1517,10 @@ void Configure::applySpecSpecifics()
         dictionary[ "QT3SUPPORT" ]          = "no";
         dictionary[ "OPENGL" ]              = "no";
         dictionary[ "OPENSSL" ]             = "yes";
+        // We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6.
+        // Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt
+        // symbian socket engine.
+        dictionary[ "IPV6" ]                = "no";
         dictionary[ "STL" ]                 = "yes";
         dictionary[ "EXCEPTIONS" ]          = "yes";
         dictionary[ "RTTI" ]                = "yes";
@@ -1848,6 +1860,8 @@ bool Configure::displayHelp()
         desc("STYLE_S60" , "yes", "",                   "  s60\n", ' ');
         desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7.");
         desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7.");
+        desc("MSVC_MP", "no", "-no-mp",                 "Do not use multiple processors for compiling with MSVC");
+        desc("MSVC_MP", "yes", "-mp",                   "Use multiple processors for compiling with MSVC (-MP)");
 
 /*      We do not support -qconfig on Windows yet
 
@@ -2822,7 +2836,7 @@ void Configure::generateCachefile()
         for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
             cacheStream << (*var) << endl;
         }
-        cacheStream << "CONFIG         += " << qmakeConfig.join(" ") << " incremental create_prl link_prl depend_includepath QTDIR_build" << endl;
+        cacheStream << "CONFIG         += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath QTDIR_build" << endl;
 
         QStringList buildParts;
         buildParts << "libs" << "tools" << "examples" << "demos" << "docs" << "translations";
@@ -2885,6 +2899,8 @@ void Configure::generateCachefile()
 
         if (dictionary[ "LTCG" ] == "yes")
             configStream << " ltcg";
+        if (dictionary[ "MSVC_MP" ] == "yes")
+            configStream << " msvc_mp";
         if (dictionary[ "STL" ] == "yes")
             configStream << " stl";
         if (dictionary[ "EXCEPTIONS" ] == "yes")
diff --git a/tools/designer/src/lib/shared/actionrepository.cpp b/tools/designer/src/lib/shared/actionrepository.cpp
index 1076ff412a..a54c1e7f46 100644
--- a/tools/designer/src/lib/shared/actionrepository.cpp
+++ b/tools/designer/src/lib/shared/actionrepository.cpp
@@ -397,9 +397,10 @@ void ActionTreeView::contextMenuEvent(QContextMenuEvent *event)
     emit contextMenuRequested(event, m_model->actionAt(indexAt(event->pos())));
 }
 
-void ActionTreeView::currentChanged(const QModelIndex &current, const QModelIndex &/*previous*/)
+void ActionTreeView::currentChanged(const QModelIndex &current, const QModelIndex &previous)
 {
     emit currentChanged(m_model->actionAt(current));
+    QTreeView::currentChanged(current, previous);
 }
 
 void ActionTreeView::slotActivated(const QModelIndex &index)
@@ -478,9 +479,10 @@ void ActionListView::contextMenuEvent(QContextMenuEvent *event)
     emit contextMenuRequested(event, m_model->actionAt(indexAt(event->pos())));
 }
 
-void ActionListView::currentChanged(const QModelIndex &current, const QModelIndex & /*previous*/)
+void ActionListView::currentChanged(const QModelIndex &current, const QModelIndex &previous)
 {
     emit currentChanged(m_model->actionAt(current));
+    QListView::currentChanged(current, previous);
 }
 
 void ActionListView::slotActivated(const QModelIndex &index)
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 7d11823c8b..265df059d0 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -1030,6 +1030,8 @@ void MainWindow::findAgain()
                             break;
                         if (searchItem(m->extraComment()))
                             break;
+                        if (searchItem(m->translatorComment()))
+                            break;
                         m_foundWhere = DataModel::NoLocation;
                         // did not find the search string in this message
                     }
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 8d4d27fbbc..ed5ee17580 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -171,5 +171,5 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "    </form>\n" \
 			  "  </div>\n" \
 			  "  <div id=\"blurpage\">\n" \
-			  "  </div>\n" \
+			  "  <!--/div -->\n" \
                           "  </div>\n"
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 7421b5e320..78cd64d5d2 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -441,6 +441,7 @@ static QDeclarativeViewer *createViewer()
 
     QDeclarativeViewer *viewer = new QDeclarativeViewer(0, wflags);
     viewer->setAttribute(Qt::WA_DeleteOnClose, true);
+    viewer->setUseGL(opts.useGL);
 
     if (!opts.scriptopts.isEmpty()) {
         viewer->setScriptOptions(opts.scriptOptions);
@@ -492,8 +493,6 @@ void showViewer(QDeclarativeViewer *viewer)
         viewer->showMaximized();
     else
         viewer->show();
-
-    viewer->setUseGL(opts.useGL);
     viewer->raise();
 }
 
diff --git a/translations/assistant_uk.ts b/translations/assistant_uk.ts
index c7aad839ca..d08003ee96 100644
--- a/translations/assistant_uk.ts
+++ b/translations/assistant_uk.ts
@@ -41,7 +41,7 @@
 
 Reason:
 %2</source>
-        <translation>Не можу зареєструвати файл документації
+        <translation>Не вдалось зареєструвати файл документації
 %1
 
 Причина:
@@ -57,7 +57,7 @@ Reason:
 
 Reason:
 %2</source>
-        <translation>Не можу скасувати реєстрацію файлу документації
+        <translation>Не вдалось скасувати реєстрацію файлу документації
 %1
 
 Причина:
@@ -77,7 +77,7 @@ Reason:
     </message>
     <message>
         <source>Cannot load sqlite database driver!</source>
-        <translation>Не можу завантажити драйвер бази даних SQLite!</translation>
+        <translation>Неможливо завантажити драйвер бази даних SQLite!</translation>
     </message>
 </context>
 <context>
@@ -108,6 +108,17 @@ Reason:
     </message>
 </context>
 <context>
+    <name>BookmarkItem</name>
+    <message>
+        <source>New Folder</source>
+        <translation>Нова тека</translation>
+    </message>
+    <message>
+        <source>Untitled</source>
+        <translation>Без назви</translation>
+    </message>
+</context>
+<context>
     <name>BookmarkManager</name>
     <message>
         <source>Untitled</source>
@@ -313,6 +324,60 @@ Reason:
 <context>
     <name>CmdLineParser</name>
     <message>
+        <source>Usage: assistant [Options]
+
+-collectionFile file       Uses the specified collection
+                           file instead of the default one
+-showUrl url               Shows the document with the
+                           url.
+-enableRemoteControl       Enables Assistant to be
+                           remotely controlled.
+-show widget               Shows the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-activate widget           Activates the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-hide widget               Hides the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-register helpFile         Registers the specified help file
+                           (.qch) in the given collection
+                           file.
+-unregister helpFile       Unregisters the specified help file
+                           (.qch) from the give collection
+                           file.
+-setCurrentFilter filter   Set the filter as the active filter.
+-remove-search-index       Removes the full text search index.
+-rebuild-search-index      Re-builds the full text search index (potentially slow).
+-quiet                     Does not display any error or
+                           status message.
+-help                      Displays this help.
+</source>
+        <translation>Використання: assistant [Опції]
+
+-collectionFile файл       Використати вказаний файл колекції
+                           замість типового
+-showUrl URL               Показати документ з URL.
+-enableRemoteControl       Увімкнути віддалене керування Assistant.
+-show віджет               Показати вказаний віджет (може бути:
+                           &quot;contents&quot;, &quot;index&quot;, &quot;bookmarks&quot; чи &quot;search&quot;).
+-activate віджет           Активувати вказаний віджет (може бути:
+                           &quot;contents&quot;, &quot;index&quot;, &quot;bookmarks&quot; чи &quot;search&quot;).
+-hide віджет               Сховати вказаний віджет (може бути:
+                           &quot;contents&quot;, &quot;index&quot;, &quot;bookmarks&quot; чи &quot;search&quot;).
+-register файлДовідки      Зареєструвати вказаний файл довідки
+                           (.qch) в даному файлі колекції.
+-unregister файлДовідки    Скасувати реєстрацію вказаного файлу довідки
+                           (.qch) в даному файлі колекції.
+-setCurrentFilter фільтр   Встановити фільтр в якості активного.
+-remove-search-index       Видалити повнотекстовий пошуковий індекс.
+-rebuild-search-index      Перебудувати повнотекстовий пошуковий індекс (можливо довго).
+-quiet                     Не показувати жодних помилок чи статусних повідомлень.
+-help                      Показати цю довідку.
+</translation>
+    </message>
+    <message>
         <source>Unknown option: %1</source>
         <translation>Невідома опція: %1</translation>
     </message>
@@ -487,6 +552,11 @@ Reason:
         <source>The attributes for custom filter &apos;%1&apos; are defined multiple times.</source>
         <translation>Атрибути для користувацького фільтра &apos;%1&apos; визначено декілька раз.</translation>
     </message>
+    <message>
+        <source>unfiltered</source>
+        <comment>list of available documentation</comment>
+        <translation>без фільтра</translation>
+    </message>
 </context>
 <context>
     <name>FindWidget</name>
@@ -513,6 +583,10 @@ Reason:
         <source>Converting File</source>
         <translation>Конвертування файлу</translation>
     </message>
+    <message>
+        <source>Creating the new Qt help files from the old ADP file.</source>
+        <translation>Створення нових файлів довідки Qt зі старого файлу ADP.</translation>
+    </message>
 </context>
 <context>
     <name>FontPanel</name>
@@ -577,6 +651,13 @@ Reason:
     </message>
 </context>
 <context>
+    <name>HelpGenerator</name>
+    <message>
+        <source>Warning: %1</source>
+        <translation>Попередження: %1</translation>
+    </message>
+</context>
+<context>
     <name>HelpViewer</name>
     <message>
         <source>&lt;title&gt;about:blank&lt;/title&gt;</source>
@@ -584,7 +665,7 @@ Reason:
     </message>
     <message>
         <source>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;The page could not be found&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</source>
-        <translation>&lt;title&gt;Помилка 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;Неможливо знайти сторінку&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
+        <translation>&lt;title&gt;Помилка 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;Не вдалось знайти сторінку&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <source>Copy &amp;Link Location</source>
@@ -600,6 +681,13 @@ Reason:
     </message>
 </context>
 <context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Wizard Assistant&lt;/b&gt;&lt;/center&gt;</source>
+        <translation>&lt;center&gt;&lt;b&gt;Майстер Assistant&lt;/b&gt;&lt;/center&gt;</translation>
+    </message>
+</context>
+<context>
     <name>IdentifierPage</name>
     <message>
         <source>Form</source>
@@ -736,7 +824,7 @@ Reason:
     </message>
     <message>
         <source>Unable to save the file %1: %2.</source>
-        <translation>Не можу зберегти файл %1: %2.</translation>
+        <translation>Неможливо зберегти файл %1: %2.</translation>
     </message>
     <message>
         <source>Downloading %1...</source>
@@ -988,6 +1076,10 @@ Reason:
         <translation>Не вдалось знайти елемент, пов&apos;язаний зі змістом.</translation>
     </message>
     <message>
+        <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
+        <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Версія %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>About %1</source>
         <translation>Про %1</translation>
     </message>
@@ -997,7 +1089,7 @@ Reason:
     </message>
     <message>
         <source>Could not register file &apos;%1&apos;: %2</source>
-        <translation>Не можу зареєструвати файл &apos;%1&apos;: %2</translation>
+        <translation>Не вдалось зареєструвати файл &apos;%1&apos;: %2</translation>
     </message>
 </context>
 <context>
@@ -1221,45 +1313,20 @@ Do you want to remove it?</source>
     </message>
 </context>
 <context>
-    <name>QCLuceneResultWidget</name>
-    <message>
-        <source>Search Results</source>
-        <translation>Результати пошуку</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation>Примітка:</translation>
-    </message>
-    <message>
-        <source>The search results may not be complete since the documentation is still being indexed!</source>
-        <translation>Результати пошуку можуть бути не повні, оскільки документація досі індексується!</translation>
-    </message>
-    <message>
-        <source>Your search did not match any documents.</source>
-        <translation>Ваш пошук не повернув результатів.</translation>
-    </message>
-    <message>
-        <source>(The reason for this might be that the documentation is still being indexed.)</source>
-        <translation>(Причиною цього може бути те, що документація досі індексується.)</translation>
-    </message>
-</context>
-<context>
     <name>QCollectionGenerator</name>
     <message>
         <source>Unknown token at line %1.</source>
         <translation>Невідомий токен в рядку %1.</translation>
     </message>
     <message>
-        <source>Unknown token at line %1. Expected &quot;QtHelpCollectionProject&quot;!</source>
-        <translation>Невідомий токен в рядку %1. Очікувався &quot;QtHelpCollectionProject&quot;!</translation>
+        <source>Missing end tags.</source>
+        <translation>Відсутні кінцеві теги.</translation>
     </message>
     <message>
-        <source>Missing output file name!</source>
-        <translation>Відсутнє ім&apos;я вихідного файлу!</translation>
-    </message>
-    <message>
-        <source>Missing collection config file!</source>
-        <translation>Відсутній файл налаштувань колекції!</translation>
+        <source>Qt Collection Generator version 1.0 (Qt %1)
+</source>
+        <translation>Qt Collection Generator версії 1.0 (Qt %1)
+</translation>
     </message>
     <message>
         <source>
@@ -1288,209 +1355,92 @@ qcollectiongenerator &lt;файл-налаштувань-колекції&gt; [�
 
 </translation>
     </message>
-</context>
-<context>
-    <name>QHelp</name>
     <message>
-        <source>Untitled</source>
-        <translation>Без назви</translation>
-    </message>
-</context>
-<context>
-    <name>QHelpCollectionHandler</name>
-    <message>
-        <source>The collection file &apos;%1&apos; is not set up yet!</source>
-        <translation>Файл колекції &apos;%1&apos; ще не встановлено!</translation>
-    </message>
-    <message>
-        <source>Cannot load sqlite database driver!</source>
-        <translation>Не можу завантажити драйвер бази даних SQLite!</translation>
-    </message>
-    <message>
-        <source>Cannot open collection file: %1</source>
-        <translation>Неможливо відкрити файл колекції: %1</translation>
-    </message>
-    <message>
-        <source>Cannot create tables in file %1!</source>
-        <translation>Неможливо створити таблиці в файлі %1!</translation>
-    </message>
-    <message>
-        <source>The collection file &apos;%1&apos; already exists!</source>
-        <translation>Файл колекції &apos;%1&apos; вже існує!</translation>
-    </message>
-    <message>
-        <source>Cannot create directory: %1</source>
-        <translation>Неможливо створити теку: %1</translation>
-    </message>
-    <message>
-        <source>Cannot copy collection file: %1</source>
-        <translation>Неможливо скопіювати файл колекції: %1</translation>
+        <source>Unknown token at line %1. Expected &quot;QtHelpCollectionProject&quot;.</source>
+        <translation>Невідомий токен в рядку %1. Очікувався &quot;QtHelpCollectionProject&quot;.</translation>
     </message>
     <message>
-        <source>Unknown filter &apos;%1&apos;!</source>
-        <translation>Невідомий фільтр &apos;%1&apos;!</translation>
+        <source>Missing input or output file for help file generation.</source>
+        <translation>Відсутній вхідний чи вихідний файл для генерації файлу довідки.</translation>
     </message>
     <message>
-        <source>Cannot register filter %1!</source>
-        <translation>Неможливо зареєструвати фільтр %1!</translation>
+        <source>Missing output file name.</source>
+        <translation>Відсутнє ім&apos;я вихідного файлу.</translation>
     </message>
     <message>
-        <source>Cannot open documentation file %1!</source>
-        <translation>Неможливо відкрити файл документації %1!</translation>
+        <source>Missing collection config file.</source>
+        <translation>Відсутній файл налаштувань колекції.</translation>
     </message>
     <message>
-        <source>Invalid documentation file &apos;%1&apos;!</source>
-        <translation>Неправильний файл документації &apos;%1&apos;!</translation>
+        <source>Could not open %1.
+</source>
+        <translation>Не вдалось відкрити %1.
+</translation>
     </message>
     <message>
-        <source>The namespace %1 was not registered!</source>
-        <translation>Простір імен %1 не зареєстровано!</translation>
+        <source>Reading collection config file...
+</source>
+        <translation>Читання файлу налаштувань колекції...
+</translation>
     </message>
     <message>
-        <source>Namespace %1 already exists!</source>
-        <translation>Простір імен %1 вже існує!</translation>
+        <source>Collection config file error: %1
+</source>
+        <translation>Помилка файлу налаштувань колекції: %1
+</translation>
     </message>
     <message>
-        <source>Cannot register namespace &apos;%1&apos;!</source>
-        <translation>Неможливо зареєструвати простір імен &apos;%1&apos;!</translation>
+        <source>Generating help for %1...
+</source>
+        <translation>Генерування довідки для %1...
+</translation>
     </message>
     <message>
-        <source>Cannot open database &apos;%1&apos; to optimize!</source>
-        <translation>Неможливо відкрити базу даних &apos;%1&apos; для оптимізації!</translation>
+        <source>Creating collection file...
+</source>
+        <translation>Створення файлу колекції...
+</translation>
     </message>
-</context>
-<context>
-    <name>QHelpDBReader</name>
     <message>
-        <source>Cannot open database &apos;%1&apos; &apos;%2&apos;: %3</source>
-        <extracomment>The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string</extracomment>
-        <translation>Неможливо відкрити базу даних: &apos;%1&apos; &apos;%2&apos;: %3</translation>
+        <source>The file %1 cannot be overwritten.
+</source>
+        <translation>Неможливо перезаписати файл %1.
+</translation>
     </message>
-</context>
-<context>
-    <name>QHelpEngineCore</name>
     <message>
-        <source>Cannot open documentation file %1: %2!</source>
-        <translation>Неможливо файл документації %1: %2!</translation>
+        <source>Cannot open %1.
+</source>
+        <translation>Неможливо відкрити %1.
+</translation>
     </message>
     <message>
-        <source>The specified namespace does not exist!</source>
-        <translation>Вказаний простір імен не існує!</translation>
+        <source>Cannot open referenced image file %1.
+</source>
+        <translation>Неможливо відкрити файл зображення %1, на який є посилання.
+</translation>
     </message>
 </context>
 <context>
     <name>QHelpGenerator</name>
     <message>
-        <source>Invalid help data!</source>
-        <translation>Неправильні дані довідки!</translation>
-    </message>
-    <message>
-        <source>No output file name specified!</source>
-        <translation>Не вказане ім&apos;я вихідного файлу!</translation>
-    </message>
-    <message>
-        <source>The file %1 cannot be overwritten!</source>
-        <translation>Неможливо перезаписати файл %1!</translation>
-    </message>
-    <message>
-        <source>Building up file structure...</source>
-        <translation>Побудова структури файлу....</translation>
-    </message>
-    <message>
-        <source>Cannot open data base file %1!</source>
-        <translation>Неможливо відкрити файл бази даних %1!</translation>
+        <source>Missing output file name.</source>
+        <translation>Відсутнє ім&apos;я вихідного файлу.</translation>
     </message>
     <message>
-        <source>Cannot register namespace %1!</source>
-        <translation>Неможливо зареєструвати простір імен %1!</translation>
-    </message>
-    <message>
-        <source>Insert custom filters...</source>
-        <translation>Вставка фільтрів користувача...</translation>
-    </message>
-    <message>
-        <source>Insert help data for filter section (%1 of %2)...</source>
-        <translation>Вставка даних довідки для розділу фільтра (%1 з %2)...</translation>
-    </message>
-    <message>
-        <source>Documentation successfully generated.</source>
-        <translation>Документацію успішно згенеровано.</translation>
-    </message>
-    <message>
-        <source>Some tables already exist!</source>
-        <translation>Деякі таблиці вже існують!</translation>
-    </message>
-    <message>
-        <source>Cannot create tables!</source>
-        <translation>Неможливо створити таблиці!</translation>
-    </message>
-    <message>
-        <source>Cannot register virtual folder!</source>
-        <translation>Неможливо зареєструвати віртуальну теку!</translation>
-    </message>
-    <message>
-        <source>Insert files...</source>
-        <translation>Вставка файлів...</translation>
-    </message>
-    <message>
-        <source>The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it.</source>
-        <translation>Файл %1 має бути всередині підтеки (%2). Пропускаємо його.</translation>
-    </message>
-    <message>
-        <source>The file %1 does not exist! Skipping it.</source>
-        <translation>Файл %1 не існує! Пропускаємо його.</translation>
-    </message>
-    <message>
-        <source>Cannot open file %1! Skipping it.</source>
-        <translation>Неможливо відкрити файл %1! Пропускаємо його.</translation>
-    </message>
-    <message>
-        <source>The filter %1 is already registered!</source>
-        <translation>Фільтр %1 вже зареєстровано!</translation>
-    </message>
-    <message>
-        <source>Cannot register filter %1!</source>
-        <translation>Неможливо зареєструвати фільтр %1!</translation>
-    </message>
-    <message>
-        <source>Insert indices...</source>
-        <translation>Вставка індексів...</translation>
-    </message>
-    <message>
-        <source>Insert contents...</source>
-        <translation>Вставка змісту...</translation>
-    </message>
-    <message>
-        <source>Cannot insert contents!</source>
-        <translation>Неможливо вставити зміст!</translation>
-    </message>
-    <message>
-        <source>Cannot register contents!</source>
-        <translation>Неможливо зареєструвати зміст!</translation>
-    </message>
-    <message>
-        <source>File &apos;%1&apos; does not exist.</source>
-        <translation>Файл &apos;%1&apos; не існує.</translation>
-    </message>
-    <message>
-        <source>File &apos;%1&apos; cannot be opened.</source>
-        <translation>Неможливо відкрити файл &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <source>File &apos;%1&apos; contains an invalid link to file &apos;%2&apos;</source>
-        <translation>Файл &apos;%1&apos; містить неправильне посилання до файлу &apos;%2&apos;</translation>
-    </message>
-    <message>
-        <source>Invalid links in HTML files.</source>
-        <translation>Неправильні посилання в файлах HTML.</translation>
+        <source>Qt Help Generator version 1.0 (Qt %1)
+</source>
+        <translation>Qt Help Generator версії 1.0 (Qt %1)
+</translation>
     </message>
     <message>
-        <source>Missing output file name!</source>
-        <translation>Відсутнє ім&apos;я вихідного файлу!</translation>
+        <source>Missing Qt help project file.</source>
+        <translation>Відсутній файл проекту колекції довідки Qt.</translation>
     </message>
     <message>
-        <source>Missing Qt help project file!</source>
-        <translation>Відсутній файл проекту колекції довідки Qt!</translation>
+        <source>Could not open %1.
+</source>
+        <translation>Не вдалось відкрити %1.
+</translation>
     </message>
     <message>
         <source>
@@ -1524,102 +1474,11 @@ qhelpgenerator &lt;файл-проекту-довідки&gt; [опції]
 
 </translation>
     </message>
-</context>
-<context>
-    <name>QHelpProject</name>
-    <message>
-        <source>Unknown token.</source>
-        <translation>Невідомий токен.</translation>
-    </message>
-    <message>
-        <source>Unknown token. Expected &quot;QtHelpProject&quot;!</source>
-        <translation>Невідомий токен. Очікувався &quot;QtHelpProject&quot;!</translation>
-    </message>
-    <message>
-        <source>Error in line %1: %2</source>
-        <translation>Помилка в рядку %1: %2</translation>
-    </message>
-    <message>
-        <source>Virtual folder has invalid syntax.</source>
-        <translation>Віртуальна тека має неправильний синтаксис.</translation>
-    </message>
-    <message>
-        <source>Namespace has invalid syntax.</source>
-        <translation>Простір імен має неправильний синтаксис.</translation>
-    </message>
-    <message>
-        <source>Missing namespace in QtHelpProject.</source>
-        <translation>Відсутній простір імен в QtHelpProject.</translation>
-    </message>
-    <message>
-        <source>Missing virtual folder in QtHelpProject</source>
-        <translation>Відсутня віртуальна тека в QtHelpProject</translation>
-    </message>
-    <message>
-        <source>Missing attribute in keyword at line %1.</source>
-        <translation>Відсутній атрибут в ключовому слові на рядку %1.</translation>
-    </message>
-    <message>
-        <source>The input file %1 could not be opened!</source>
-        <translation>Неможливо відкрити вхідний файл %1!</translation>
-    </message>
-</context>
-<context>
-    <name>QHelpSearchQueryWidget</name>
-    <message>
-        <source>Search for:</source>
-        <translation>Шукати:</translation>
-    </message>
     <message>
-        <source>Previous search</source>
-        <translation>Попередній пошук</translation>
-    </message>
-    <message>
-        <source>Next search</source>
-        <translation>Наступний пошук</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Пошук</translation>
-    </message>
-    <message>
-        <source>Advanced search</source>
-        <translation>Розширений пошук</translation>
-    </message>
-    <message>
-        <source>words &lt;B&gt;similar&lt;/B&gt; to:</source>
-        <translation>слова &lt;B&gt;схожі&lt;/B&gt; на:</translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;without&lt;/B&gt; the words:</source>
-        <translation>&lt;B&gt;без&lt;/B&gt; слів:</translation>
-    </message>
-    <message>
-        <source>with &lt;B&gt;exact phrase&lt;/B&gt;:</source>
-        <translation>з &lt;B&gt;точною фразою&lt;/B&gt;:</translation>
-    </message>
-    <message>
-        <source>with &lt;B&gt;all&lt;/B&gt; of the words:</source>
-        <translation>з &lt;B&gt;усіма&lt;/B&gt; словами:</translation>
-    </message>
-    <message>
-        <source>with &lt;B&gt;at least one&lt;/B&gt; of the words:</source>
-        <translation>з &lt;B&gt;щонайменше одним&lt;/B&gt; зі слів:</translation>
-    </message>
-</context>
-<context>
-    <name>QHelpSearchResultWidget</name>
-    <message numerus="yes">
-        <source>%1 - %2 of %n Hits</source>
-        <translation>
-            <numerusform>%1 - %2 з %n збігу</numerusform>
-            <numerusform>%1 - %2 з %n збігів</numerusform>
-            <numerusform>%1 - %2 з %n збігів</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>0 - 0 of 0 Hits</source>
-        <translation>0 - 0 of 0 збігів</translation>
+        <source>Could not create output directory: %1
+</source>
+        <translation>Не вдалось створити вихідну теку: %1
+</translation>
     </message>
 </context>
 <context>
diff --git a/translations/designer_uk.ts b/translations/designer_uk.ts
index ae27e67ab9..12e60e697c 100644
--- a/translations/designer_uk.ts
+++ b/translations/designer_uk.ts
@@ -25,6 +25,49 @@
     </message>
 </context>
 <context>
+    <name>AbstractItemEditor</name>
+    <message>
+        <source>Selectable</source>
+        <translation>Можна вибирати</translation>
+    </message>
+    <message>
+        <source>Editable</source>
+        <translation>Можна редагувати</translation>
+    </message>
+    <message>
+        <source>DragEnabled</source>
+        <translation>Можна тягти</translation>
+    </message>
+    <message>
+        <source>DropEnabled</source>
+        <translation>Можна кидати</translation>
+    </message>
+    <message>
+        <source>UserCheckable</source>
+        <translation>Користувач може позначати</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Увімкнено</translation>
+    </message>
+    <message>
+        <source>Tristate</source>
+        <translation>Три стани</translation>
+    </message>
+    <message>
+        <source>Unchecked</source>
+        <translation>Не позначено</translation>
+    </message>
+    <message>
+        <source>PartiallyChecked</source>
+        <translation>Частково позначено</translation>
+    </message>
+    <message>
+        <source>Checked</source>
+        <translation>Позначено</translation>
+    </message>
+</context>
+<context>
     <name>AddLinkDialog</name>
     <message>
         <source>Insert Link</source>
@@ -62,7 +105,7 @@
     </message>
     <message>
         <source>The font file &apos;%1&apos; could not be loaded.</source>
-        <translation>Неможливо завантажити файл шрифт &apos;%1&apos;.</translation>
+        <translation>Не вдалось завантажити файл шрифт &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>&apos;%1&apos; is not a valid font id.</source>
@@ -74,7 +117,7 @@
     </message>
     <message>
         <source>The font &apos;%1&apos; (%2) could not be unloaded.</source>
-        <translation>Неможливо вивантажити шрифт &apos;%1&apos; (%2).</translation>
+        <translation>Не вдалось вивантажити шрифт &apos;%1&apos; (%2).</translation>
     </message>
 </context>
 <context>
@@ -639,7 +682,7 @@
     </message>
     <message>
         <source>The converted file could not be read.</source>
-        <translation>Неможливо прочитати конвертований файл.</translation>
+        <translation>Не вдалось прочитати конвертований файл.</translation>
     </message>
     <message>
         <source>This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer.</source>
@@ -652,7 +695,7 @@
     <message>
         <source>This file was created using Designer from Qt-%1 and could not be read:
 %2</source>
-        <translation>Неможливо прочитати файл, бо його було створено з використанням Designer з Qt-%1:
+        <translation>Не вдалось прочитати файл, бо його було створено з використанням Designer з Qt-%1:
 %2</translation>
     </message>
     <message>
@@ -672,14 +715,14 @@
     </message>
     <message>
         <source>&apos;%1&apos; could not be converted to an enumeration value of type &apos;%2&apos;.</source>
-        <translation>Неможливо сконвертувати &apos;%1&apos;до типу значень переліку &apos;%2&apos;.</translation>
+        <translation>Не вдалось сконвертувати &apos;%1&apos;до типу значень переліку &apos;%2&apos;.</translation>
     </message>
 </context>
 <context>
     <name>DesignerMetaFlags</name>
     <message>
         <source>&apos;%1&apos; could not be converted to a flag value of type &apos;%2&apos;.</source>
-        <translation>&apos;%1&apos; не можу бути сконвертовано до прапорця типу &apos;%2&apos;.</translation>
+        <translation>Не вдалось перетворити &apos;%1&apos; прапорця типу &apos;%2&apos;.</translation>
     </message>
 </context>
 <context>
@@ -721,7 +764,7 @@
     <name>DeviceSkin</name>
     <message>
         <source>The image file &apos;%1&apos; could not be loaded.</source>
-        <translation>Неможливо завантажити файл зображення &apos;%1&apos;.</translation>
+        <translation>Не вдалось завантажити файл зображення &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
@@ -729,11 +772,11 @@
     </message>
     <message>
         <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
-        <translation>Неможливо відкрити файл налаштувань &apos;%1&apos;.</translation>
+        <translation>Не вдалось відкрити файл налаштувань &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
-        <translation>Неможливо прочитати файл налаштувань &apos;%1&apos;: %2</translation>
+        <translation>Не вдалось прочитати файл налаштувань &apos;%1&apos;: %2</translation>
     </message>
     <message>
         <source>Syntax error: %1</source>
@@ -1044,11 +1087,11 @@ Parsing grid layout minimum size values</extracomment>
     </message>
     <message>
         <source>A temporary form file could not be created in %1.</source>
-        <translation>Неможливо створити тимчасовий файл форми в %1.</translation>
+        <translation>Не вдалось створити тимчасовий файл форми в %1.</translation>
     </message>
     <message>
         <source>The temporary form file %1 could not be written.</source>
-        <translation>Неможливо записати тимчасовий файл форми %1.</translation>
+        <translation>Не вдалось записати тимчасовий файл форми %1.</translation>
     </message>
 </context>
 <context>
@@ -1179,7 +1222,7 @@ This indicates an inconsistency in the ui-file.</source>
     </message>
     <message>
         <source>While applying tab stops: The widget &apos;%1&apos; could not be found.</source>
-        <translation>Під час застосування позицій табуляції: Неможливо знайти віджет &apos;%1&apos;.</translation>
+        <translation>Під час застосування позицій табуляції: Не вдалось знайти віджет &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>Invalid QButtonGroup reference &apos;%1&apos; referenced by &apos;%2&apos;.</source>
@@ -1464,13 +1507,13 @@ Do you want to update the file location or generate a new form?</source>
     </message>
     <message>
         <source>Could not open file</source>
-        <translation>Неможливо відкрити файл</translation>
+        <translation>Не вдалось відкрити файл</translation>
     </message>
     <message>
         <source>The file %1 could not be opened.
 Reason: %2
 Would you like to retry or select a different file?</source>
-        <translation>Неможливо відкрити файл %1.
+        <translation>Не вдалось відкрити файл %1.
 Причина: %2
 Чи не хотіли б ви спробувати ще раз чи вибрати інший файл?</translation>
     </message>
@@ -1480,7 +1523,7 @@ Would you like to retry or select a different file?</source>
     </message>
     <message>
         <source>Could not write file</source>
-        <translation>Неможливо записати файл</translation>
+        <translation>Не вдалось записати файл</translation>
     </message>
     <message>
         <source>It was not possible to write the entire file %1 to disk.
@@ -1500,15 +1543,15 @@ Would you like to retry?</source>
     </message>
     <message>
         <source>The backup file %1 could not be written.</source>
-        <translation>Неможливо записати файл резервної копії %1.</translation>
+        <translation>Не вдалось записати файл резервної копії %1.</translation>
     </message>
     <message>
         <source>The backup directory %1 could not be created.</source>
-        <translation>Неможливо створити теку резервних копій %1.</translation>
+        <translation>Не вдалось створити теку резервних копій %1.</translation>
     </message>
     <message>
         <source>The temporary backup directory %1 could not be created.</source>
-        <translation>Неможливо створити тимчасову теку резервних копій %1.</translation>
+        <translation>Не вдалось створити тимчасову теку резервних копій %1.</translation>
     </message>
     <message>
         <source>Preview failed</source>
@@ -1528,7 +1571,7 @@ Would you like to retry?</source>
     </message>
     <message>
         <source>The file %1 could not be written.</source>
-        <translation>Неможливо записати файл %1.</translation>
+        <translation>Не вдалось записати файл %1.</translation>
     </message>
     <message>
         <source>Please close all forms to enable the loading of additional fonts.</source>
@@ -1735,7 +1778,7 @@ Container pages should only be added by specifying them in XML returned by the d
     <name>QDesignerSharedSettings</name>
     <message>
         <source>The template path %1 could not be created.</source>
-        <translation>Неможливо створити шлях до шаблону %1.</translation>
+        <translation>Не вдалось створити шлях до шаблону %1.</translation>
     </message>
     <message>
         <source>An error has been encountered while parsing device profile XML: %1</source>
@@ -1845,7 +1888,7 @@ Container pages should only be added by specifying them in XML returned by the d
     </message>
     <message>
         <source>The file &lt;b&gt;%1&lt;/b&gt; could not be opened.</source>
-        <translation>Неможливо відкрити файл &lt;b&gt;%1&lt;/b&gt;.</translation>
+        <translation>Не вдалось відкрити файл &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>The file &lt;b&gt;%1&lt;/b&gt; is not a valid Designer UI file.</source>
@@ -1877,11 +1920,11 @@ Empty class name passed to widget factory method</extracomment>
     </message>
     <message>
         <source>The set-type property %1 could not be read.</source>
-        <translation>Неможливо прочитати властивість %1 типу &quot;множина&quot;.</translation>
+        <translation>Не вдалось прочитати властивість %1 типу &quot;множина&quot;.</translation>
     </message>
     <message>
         <source>The enumeration-type property %1 could not be read.</source>
-        <translation>Неможливо прочитати властивість %1 типу &quot;перелік&quot;.</translation>
+        <translation>Не вдалось прочитати властивість %1 типу &quot;перелік&quot;.</translation>
     </message>
     <message>
         <source>Reading properties of the type %1 is not supported yet.</source>
@@ -1889,7 +1932,7 @@ Empty class name passed to widget factory method</extracomment>
     </message>
     <message>
         <source>The property %1 could not be written. The type %2 is not supported yet.</source>
-        <translation>Неможливо записати властивість %1. Тип %2 ще не підтримується.</translation>
+        <translation>Не вдалось записати властивість %1. Тип %2 ще не підтримується.</translation>
     </message>
     <message>
         <source>The enumeration-value &apos;%1&apos; is invalid. The default value &apos;%2&apos; will be used instead.</source>
@@ -2513,6 +2556,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtLocalePropertyManager</name>
     <message>
+        <source>&lt;Invalid&gt;</source>
+        <translation>&lt;Неправильний&gt;</translation>
+    </message>
+    <message>
         <source>%1, %2</source>
         <translation>%1, %2</translation>
     </message>
@@ -2740,14 +2787,14 @@ This could for example be a language extension like &quot;_de&quot;.</source>
     </message>
     <message>
         <source>Could not overwrite %1.</source>
-        <translation>Неможливо перезаписати %1.</translation>
+        <translation>Не вдалось перезаписати %1.</translation>
     </message>
     <message>
         <source>Could not copy
 %1
 to
 %2</source>
-        <translation>Неможливо копіювати
+        <translation>Не вдалось скопіювати
 %1
 до
 %2</translation>
@@ -2764,7 +2811,7 @@ to
     </message>
     <message>
         <source>Could not write %1: %2</source>
-        <translation>Неможливо записати %1: %2</translation>
+        <translation>Не вдалось записати %1: %2</translation>
     </message>
     <message>
         <source>Edit Resources</source>
@@ -3480,11 +3527,11 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>A temporary form file could not be created in %1.</source>
-        <translation>Неможливо створити тимчасовий файл форми в %1.</translation>
+        <translation>Не вдалось створити тимчасовий файл форми в %1.</translation>
     </message>
     <message>
         <source>The temporary form file %1 could not be written.</source>
-        <translation>Неможливо записати тимчасовий файл форми %1.</translation>
+        <translation>Не вдалось записати тимчасовий файл форми %1.</translation>
     </message>
     <message>
         <source>%1 - [Code]</source>
@@ -3500,11 +3547,11 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>The file %1 could not be opened: %2</source>
-        <translation>Неможливо відкрити файл %1: %2</translation>
+        <translation>Не вдалось відкрити файл %1: %2</translation>
     </message>
     <message>
         <source>The file %1 could not be written: %2</source>
-        <translation>Неможливо записати файл %1: %2</translation>
+        <translation>Не вдалось записати файл %1: %2</translation>
     </message>
     <message>
         <source>%1 - Error</source>
@@ -3951,7 +3998,7 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source>
-        <translation>Неможливо вставити віджети. Qt Designer не зміг знайти контейнер без розташування для вставки.</translation>
+        <translation>Неможливо вставити віджети. Qt Designer&apos;у не вдалось знайти контейнер без розташування для вставки.</translation>
     </message>
     <message>
         <source>Break the layout of the container you want to paste into, select this container and then paste again.</source>
@@ -4150,7 +4197,7 @@ Do you want overwrite the template?</source>
     <message>
         <source>Could not create form preview</source>
         <comment>Title of warning message box</comment>
-        <translation>Неможливо створити попередній перегляд форми</translation>
+        <translation>Не вдалось створити попередній перегляд форми</translation>
     </message>
     <message>
         <source>Form Settings - %1</source>
@@ -4225,7 +4272,7 @@ Do you want overwrite the template?</source>
     </message>
     <message>
         <source>The file &apos;%1&apos; could not be read: %2</source>
-        <translation>Неможливо прочитати файл &apos;%1&apos;: %2</translation>
+        <translation>Не вдалось прочитати файл &apos;%1&apos;: %2</translation>
     </message>
     <message>
         <source>Choose a Pixmap</source>
@@ -4740,8 +4787,16 @@ Please select another name.</source>
         <translation>Шукати нові встановлені додатки користувацьких віджетів.</translation>
     </message>
     <message>
+        <source>Loaded Plugins</source>
+        <translation>Завантажені додатки</translation>
+    </message>
+    <message>
+        <source>Failed Plugins</source>
+        <translation>Проблемні додатки</translation>
+    </message>
+    <message>
         <source>Qt Designer couldn&apos;t find any plugins</source>
-        <translation>Qt Designer не зміг знайти жодного додатку</translation>
+        <translation>Qt Designer&apos;у не вдалось знайти жодного додатку</translation>
     </message>
     <message>
         <source>Qt Designer found the following plugins</source>
@@ -5014,7 +5069,7 @@ Class: %2</source>
     </message>
     <message>
         <source>The specified qrc file &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;could not be found. Do you want to update the file location?&lt;/p&gt;</source>
-        <translation>Неможливо знайти вказаний файл qrc &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;. Бажаєте оновити розташування файлу?&lt;/p&gt;</translation>
+        <translation>Не вдалось знайти вказаний файл qrc &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;. Бажаєте оновити розташування файлу?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>New location for %1</source>
@@ -5152,7 +5207,7 @@ Class: %2</source>
     </message>
     <message>
         <source>A widget element could not be found.</source>
-        <translation>Неможливо знайти елемент віджета.</translation>
+        <translation>Не вдалось знайти елемент віджета.</translation>
     </message>
 </context>
 <context>
@@ -5741,7 +5796,7 @@ Class: %2</source>
     </message>
     <message>
         <source>The current page of the container &apos;%1&apos; (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget.</source>
-        <translation>Неможливо визначити поточну сторінку контейнера &apos;%1&apos; (%2) під час створення розташування. Це вказує на некоректність файлу UI, можливо, розташування було створене на контейнерному віджеті.</translation>
+        <translation>Не вдалось визначити поточну сторінку контейнера &apos;%1&apos; (%2) під час створення розташування. Це вказує на некоректність файлу UI, можливо, розташування було створене на контейнерному віджеті.</translation>
     </message>
     <message>
         <source>Attempt to add a layout to a widget &apos;%1&apos; (%2) which already has an unmanaged layout of type %3.
diff --git a/translations/linguist_uk.ts b/translations/linguist_uk.ts
index 6e58be50fe..ca326d6e85 100644
--- a/translations/linguist_uk.ts
+++ b/translations/linguist_uk.ts
@@ -113,7 +113,7 @@ Will assume a single universal form.</source>
     </message>
     <message>
         <source>Cannot create &apos;%2&apos;: %1</source>
-        <translation>Не можу створити &apos;%2&apos;: %1</translation>
+        <translation>Неможливо створити &apos;%2&apos;: %1</translation>
     </message>
     <message>
         <source>Universal Form</source>
@@ -259,6 +259,186 @@ Will assume a single universal form.</source>
     </message>
 </context>
 <context>
+    <name>LConvert</name>
+    <message>
+        <source>
+Usage:
+    lconvert [options] &lt;infile&gt; [&lt;infile&gt;...]
+
+lconvert is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert and filter translation data files.
+The following file formats are supported:
+
+%1
+If multiple input files are specified, they are merged with
+translations from later files taking precedence.
+
+Options:
+    -h
+    --help  Display this information and exit.
+
+    -i &lt;infile&gt;
+    --input-file &lt;infile&gt;
+           Specify input file. Use if &lt;infile&gt; might start with a dash.
+           This option can be used several times to merge inputs.
+           May be &apos;-&apos; (standard input) for use in a pipe.
+
+    -o &lt;outfile&gt;
+    --output-file &lt;outfile&gt;
+           Specify output file. Default is &apos;-&apos; (standard output).
+
+    -if &lt;informat&gt;
+    --input-format &lt;format&gt;
+           Specify input format for subsequent &lt;infile&gt;s.
+           The format is auto-detected from the file name and defaults to &apos;ts&apos;.
+
+    -of &lt;outformat&gt;
+    --output-format &lt;outformat&gt;
+           Specify output format. See -if.
+
+    --input-codec &lt;codec&gt;
+           Specify encoding for QM and PO input files. Default is &apos;Latin1&apos;
+           for QM and &apos;UTF-8&apos; for PO files. UTF-8 is always tried as well for
+           QM, corresponding to the possible use of the trUtf8() function.
+
+    --output-codec &lt;codec&gt;
+           Specify encoding for PO output files. Default is &apos;UTF-8&apos;.
+
+    --drop-tags &lt;regexp&gt;
+           Drop named extra tags when writing TS or XLIFF files.
+           May be specified repeatedly.
+
+    --drop-translations
+           Drop existing translations and reset the status to &apos;unfinished&apos;.
+           Note: this implies --no-obsolete.
+
+    --source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the source strings. Defaults to
+           POSIX if not specified and the file does not name it yet.
+
+    --target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the translation.
+           The target language is guessed from the file name if this option
+           is not specified and the file contents name no language yet.
+
+    --no-obsolete
+           Drop obsolete messages.
+
+    --no-finished
+           Drop finished messages.
+
+    --sort-contexts
+           Sort contexts in output TS file alphabetically.
+
+    --locations {absolute|relative|none}
+           Override how source code references are saved in TS files.
+           Default is absolute.
+
+    --no-ui-lines
+           Drop line numbers from references to UI files.
+
+    --verbose
+           be a bit more verbose
+
+Long options can be specified with only one leading dash, too.
+
+Return value:
+    0 on success
+    1 on command line parse failures
+    2 on read failures
+    3 on write failures
+</source>
+        <translation>
+Використання:
+    lconvert [опції] &lt;вхідний_файл&gt; [&lt;вхідний_файл&gt;...]
+
+lconvert - це частина набору програм Qt Linguist. Вона може використовуватись,
+як окремий інструмент, для конвертування та фільтрування файлів перекладу.
+Підтримуються наступні формати файлів:
+
+%1
+Якщо вказано декілька вхідних файлів, то вони об&apos;єднується з перекладами з
+попередньо вказаних файлів з урахуванням порядку задання.
+
+Опції:
+    -h
+    --help  Показати цю інформацію та вийти.
+
+    -i &lt;вхідний_файл&gt;
+    --input-file &lt;вхідний_файл&gt;
+           Вказати вхідний файл. Використовуйте, якщо &lt;вхідний_файл&gt;
+           починається з дефіса. Ця опція може бути використана декілька
+           раз, щоб об&apos;єднати вхідні дані.
+           Може бути &apos;-&apos; (стандартний вхід) для використання в конвеєрі.
+
+    -o &lt;вихідний_файл&gt;
+    --output-file &lt;вихідний_файл&gt;
+           Вказати вихідний файл. Типово - &apos;-&apos; (стандартний вихід).
+
+    -if &lt;формат&gt;
+    --input-format &lt;формат&gt;
+           Вказати вхідний формат для наступних &lt;вхідних_файлів&gt;.
+           Формат автоматично визначається з імені файлу. Типово - &apos;ts&apos;.
+
+    -of &lt;формат&gt;
+    --output-format &lt;формат&gt;
+           Вказати вихідний формат. Дивіться -if.
+
+    --input-codec &lt;кодек&gt;
+           Вказати кодування для вхідних файлів QM та PO. Типово - &apos;Latin1&apos;
+           для QM та &apos;UTF-8&apos; файлів PO. Для QM також здійснюється спроба
+           використати UTF-8, відповідно до можливого застосування функції trUtf8().
+
+    --output-codec &lt;кодек&gt;
+           Вказати кодування для вихідних файлів PO. Типово - &apos;UTF-8&apos;.
+
+    --drop-tags &lt;регулярний_вираз&gt;
+           Видалити вказані додаткові теги під час запису файлів TS чи XLIFF.
+           Може вказуватись декілька раз.
+
+    --drop-translations
+           Видаляти існуючі переклади та скидати статус в &apos;незавершений&apos;.
+           Примітка: це включає --no-obsolete.
+
+    --source-language &lt;мова&gt;[_&lt;регіон&gt;]
+           Вказати/замінити мову оригінальних рядків. Типово - POSIX,
+           якщо не вказано та не встановлено в файлі.
+
+    --target-language &lt;мова&gt;[_&lt;регіон&gt;]
+           Вказати/замінити мову перекладу.
+           Якщо ця опція не вказана і у вмісті файлу мова не задана, то
+           мова перекладу вгадується з імені файлу.
+
+    --no-obsolete
+           Відкинути застарілі повідомлення.
+
+    --no-finished
+           Відкинути завершені повідомлення.
+
+    --sort-contexts
+           Сортувати контексти в вихідному файлі TS за абеткою.
+
+    --locations {absolute|relative|none}
+           Замінити як посилання на код зберігаються в файлі TS.
+           Типово - абсолютно.
+
+    --no-ui-lines
+           Видалити номери рядків з посилань на файли UI.
+
+    --verbose
+           бути трохи більш детальним
+
+Довгі опції також можуть вказуватись лише з одним дефісом.
+
+Коди повернення:
+    0 при успіху
+    1 при помилці розбору командного рядка
+    2 при помилках читання
+    3 при помилках запису
+</translation>
+    </message>
+</context>
+<context>
     <name>LRelease</name>
     <message numerus="yes">
         <source>Dropped %n message(s) which had no ID.</source>
@@ -292,10 +472,231 @@ Will assume a single universal form.</source>
             <numerusform>    Зігноровано %n неперекладених оригінальних текстів</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Usage:
+    lrelease [options] project-file
+    lrelease [options] ts-files [-qm qm-file]
+
+lrelease is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert XML-based translations files in the TS
+format into the &apos;compiled&apos; QM format used by QTranslator objects.
+
+Options:
+    -help  Display this information and exit
+    -idbased
+           Use IDs instead of source strings for message keying
+    -compress
+           Compress the QM files
+    -nounfinished
+           Do not include unfinished translations
+    -removeidentical
+           If the translated text is the same as
+           the source text, do not include the message
+    -markuntranslated &lt;prefix&gt;
+           If a message has no real translation, use the source text
+           prefixed with the given string instead
+    -silent
+           Do not explain what is being done
+    -version
+           Display the version of lrelease and exit
+</source>
+        <translation>Використання:
+    lrelease [опції] файл-проект
+    lrelease [опції] файли-ts [-qm файл-qm]
+
+lrelease - це частина набору програм Qt Linguist. Вона може використовуватися
+як окремий засіб для перетворення файлів перекладу на базі XML в форматі TS
+до &apos;скомпільованого&apos; формату QM, що використовується об&apos;єктами QTranslator.
+
+Опції:
+    -help  Показати цю інформацію та вийти
+    -idbased
+           Використовувати ID замість рядків оригіналу як ключі повідомлень
+    -compress
+           Стискати файли QM
+    -nounfinished
+           Не включати незавершені переклади
+    -removeidentical
+           Якщо перекладений текст однаковий з оригіналом, то
+           не включати повідомлення
+    -markuntranslated &lt;prefix&gt;
+           If a message has no real translation, use the source text
+           prefixed with the given string instead
+    -silent
+           Не пояснювати, що відбувається
+    -version
+           Показати версію lrelease та вийти
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: %1</source>
+        <translation>помилка lrelease: %1</translation>
+    </message>
+    <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation>Оновлюю &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
+        <source>Removing translations equal to source text in &apos;%1&apos;...
+</source>
+        <translation>Видалення перекладів однакових з оригінальним текстом в &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot create &apos;%1&apos;: %2
+</source>
+        <translation>помилка lrelease: неможливо створити &apos;%1&apos;: %2
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot save &apos;%1&apos;: %2</source>
+        <translation>помилка lrelease: неможливо зберегти &apos;%1&apos;: %2
+</translation>
+    </message>
+    <message>
+        <source>lrelease version %1
+</source>
+        <translation>lrelease версії %1
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot read project file &apos;%1&apos;.
+</source>
+        <translation>помилка lrelease: неможливо прочитати файл проекту &apos;%1&apos;.
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot process project file &apos;%1&apos;.
+</source>
+        <translation>помилка lrelease: неможливо обробити файл проекту &apos;%1&apos;.
+</translation>
+    </message>
+    <message>
+        <source>lrelease warning: Met no &apos;TRANSLATIONS&apos; entry in project file &apos;%1&apos;
+</source>
+        <translation>попередження lrelease: в файлу проекту &apos;%1&apos; не знайдено елементу &apos;TRANSLATIONS&apos;
+</translation>
+    </message>
 </context>
 <context>
     <name>LUpdate</name>
     <message>
+        <source>Usage:
+    lupdate [options] [project-file]...
+    lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
+
+lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
+messages from Qt UI files, C++, Java and JavaScript/QtScript source code.
+Extracted messages are stored in textual translation source files (typically
+Qt TS XML). New and modified messages can be merged into existing TS files.
+
+Options:
+    -help  Display this information and exit.
+    -no-obsolete
+           Drop all obsolete strings.
+    -extensions &lt;ext&gt;[,&lt;ext&gt;]...
+           Process files with the given extensions only.
+           The extension list must be separated with commas, not with whitespace.
+           Default: &apos;%1&apos;.
+    -pluralonly
+           Only include plural form messages.
+    -silent
+           Do not explain what is being done.
+    -no-sort
+           Do not sort contexts in TS files.
+    -no-recursive
+           Do not recursively scan the following directories.
+    -recursive
+           Recursively scan the following directories (default).
+    -I &lt;includepath&gt; or -I&lt;includepath&gt;
+           Additional location to look for include files.
+           May be specified multiple times.
+    -locations {absolute|relative|none}
+           Specify/override how source code references are saved in TS files.
+           Default is absolute.
+    -no-ui-lines
+           Do not record line numbers in references to UI files.
+    -disable-heuristic {sametext|similartext|number}
+           Disable the named merge heuristic. Can be specified multiple times.
+    -pro &lt;filename&gt;
+           Name of a .pro file. Useful for files with .pro file syntax but
+           different file suffix. Projects are recursed into and merged.
+    -source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the source strings for new files.
+           Defaults to POSIX if not specified.
+    -target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the translations for new files.
+           Guessed from the file name if not specified.
+    -ts &lt;ts-file&gt;...
+           Specify the output file(s). This will override the TRANSLATIONS
+           and nullify the CODECFORTR from possibly specified project files.
+    -codecfortr &lt;codec&gt;
+           Specify the codec assumed for tr() calls. Effective only with -ts.
+    -version
+           Display the version of lupdate and exit.
+    @lst-file
+           Read additional file names (one per line) from lst-file.
+</source>
+        <translation>Використання:
+    lupdate [опції] [файл-проект]...
+    lupdate [опції] [вхідний-файл|шлях|@файл-список]... -ts ts-файли|@файл-список
+
+lupdate - це частина набору програм Qt Linguist. Вона It витягає придатні для перекладу 
+повідомлення з файлів Qt UI, коду C++, Java та JavaScript/QtScript. Витягнуті повідомлення
+зберігаються в текстовому файлі перекладу (типово Qt TS XML). Нові та модифіковані 
+повідомлення можуть бути об&apos;єднанні з існуючими файлами TS.
+
+Опції:
+    -help  Показати цю інформацію та вийти.
+    -no-obsolete
+           Видалити всі застарілі рядки.
+    -extensions &lt;розширення&gt;[,&lt;розширення&gt;]...
+           Обробляти файли лише з вказаними розширеннями.
+           Список розширень має розділюватись комами, а не пропусками.
+           Типово: &apos;%1&apos;.
+    -pluralonly
+           Включати лише повідомлення з формою множини.
+    -silent
+           Не пояснювати, що відбувається.
+    -no-sort
+           Не сортувати контексти в файлах TS.
+    -no-recursive
+           Не сканувати рекурсивно наступні теки.
+    -recursive
+           Рекурсивно сканувати наступні теки (типово).
+    -I &lt;шлях-включення&gt; або -I&lt;шлях-включення&gt;
+           Додаткові місця для пошуку файлів включення.
+           Може бути вказано декілька разів.
+    -locations {absolute|relative|none}
+           Вказати/замістити як посилання на код зберігаються в файлі TS.
+           Типово - абсолютно.
+    -no-ui-lines
+           Не записувати номери рядків в посиланнях на файли UI.
+    -disable-heuristic {sametext|similartext|number}
+           Вимкнути вказану евристику об&apos;єдання. Може бути вказано декілька разів.
+    -pro &lt;ім&apos;я-файлу&gt;
+           Ім&apos;я .pro файлу. Корисно для файлів із синтаксисом фалів .pro, але з
+           іншим розширенням. Projects are recursed into and merged.
+    -source-language &lt;мова&gt;[_&lt;регіон&gt;]
+           Вказати мову оригінальних рядків для нових файлів.
+           Типово, якщо не вказано - POSIX.
+    -target-language &lt;мова&gt;[_&lt;регіон&gt;]
+           Вказати мову перекладу для нових файлів.
+           Вгадується з імені файла, якщо не вказано.
+    -ts &lt;файл-ts&gt;...
+           Вказати вихідний файл(и). Це замістить TRANSLATIONS
+           та скине CODECFORTR з, можливо, вказаних файлів проекту.
+    -codecfortr &lt;кодек&gt;
+           Вказати кодек, що Specify the codec вживається для викликів tr(). Ефективно лише з -ts.
+    -version
+           Показати версію lupdate та вийти.
+    @файл-список
+           Читати додаткові імена файлів (одне на рядок) з файла-списку.
+</translation>
+    </message>
+    <message>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation>попередження lupdate: Кодек для tr() &apos;%1&apos; не узгоджується з існуючим кодеком файлу &apos;%2&apos;. Очікуйте неприємностей.
@@ -314,12 +715,42 @@ Will assume a single universal form.</source>
 </translation>
     </message>
     <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation>Оновлюю &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
+        <source>Stripping non plural forms in &apos;%1&apos;...
+</source>
+        <translation>Видалення не множинних форм в &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
         <source>lupdate warning: Codec for source &apos;%1&apos; is invalid. Falling back to codec for tr().
 </source>
         <translation>попередження lupdate: Кодек для джерела &apos;%1&apos; неправильний. Повертаємось до використання кодеку для tr().
 </translation>
     </message>
     <message>
+        <source>lupdate warning: TS files from command line will override TRANSLATIONS in %1.
+</source>
+        <translation>попередження lupdate: файл-TS з командного рядка замінять TRANSLATIONS в %1.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: TS files from command line prevent recursing into %1.
+</source>
+        <translation>попередження lupdate: файли TS з командного рядка перешкоджають рекурсивному проходу %1.
+</translation>
+    </message>
+    <message>
+        <source>lupdate warning: no TS files specified. Only diagnostics will be produced for &apos;%1&apos;.
+</source>
+        <translation>попередження lupdate: не вказано файлів TS. Здійснюватиметься лише діагностика для &apos;%1&apos;.
+</translation>
+    </message>
+    <message>
         <source>The option -target-language requires a parameter.
 </source>
         <translation>Опція -target-language вимагає параметра.
@@ -410,6 +841,12 @@ Will assume a single universal form.</source>
 </translation>
     </message>
     <message>
+        <source>Scanning directory &apos;%1&apos;...
+</source>
+        <translation>Сканування теки &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
         <source>lupdate warning: -target-language usually only makes sense with exactly one TS file.
 </source>
         <translation>попередження lupdate: Використання -target-language, зазвичай, має сенс лише з одним файлом TS.
@@ -433,6 +870,360 @@ Will assume a single universal form.</source>
         <translation>помилка lupdate: Одночасно вказані файл проекту та вхідні файли / шляхи для включення.
 </translation>
     </message>
+    <message>
+        <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation>Круглі/квадратні/фігурні дужки не збігаються між гілками #if та #else, використовую гілку #if
+</translation>
+    </message>
+    <message>
+        <source>Parenthesis/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation>Круглі/фігурні дужки не збігаються між гілками #if та #else, використовую гілку #if
+</translation>
+    </message>
+    <message>
+        <source>Unterminated C++ comment
+</source>
+        <translation>Незавершений коментар C++
+</translation>
+    </message>
+    <message>
+        <source>Unterminated C++ string
+</source>
+        <translation>Незавершений рядок C++
+</translation>
+    </message>
+    <message>
+        <source>Excess closing brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Забагато закриваючих фігурних дужок в коді C++ (або неправильне застосування препроцесора C++)
+</translation>
+    </message>
+    <message>
+        <source>Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Забагато закриваючих круглих дужок в коді C++ (або неправильне застосування препроцесора C++)
+</translation>
+    </message>
+    <message>
+        <source>Excess closing bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Забагато закриваючих квадратних дужок в коді C++ (або неправильне застосування препроцесора C++)
+</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2</source>
+        <translation>Неможливо відкрити %1: %2</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with tr() / QT_TR_NOOP(). Ignoring
+</source>
+        <translation>//% не може бути використаний разом з tr() / QT_TR_NOOP(). Ігнорую
+</translation>
+    </message>
+    <message>
+        <source>circular inclusion of %1
+</source>
+        <translation>циклічне вкладення %1
+</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2
+</source>
+        <translation>Неможливо відкрити %1: %2
+</translation>
+    </message>
+    <message>
+        <source>Qualifying with unknown namespace/class %1::%2
+</source>
+        <translation>Задаю з невідомим простором імен/класом %1::%2
+</translation>
+    </message>
+    <message>
+        <source>tr() cannot be called without context
+</source>
+        <translation>tr() не можна викликати без контексту
+</translation>
+    </message>
+    <message>
+        <source>Class &apos;%1&apos; lacks Q_OBJECT macro
+</source>
+        <translation>У класу &apos;%1&apos; не вистачає макросу Q_OBJECT
+</translation>
+    </message>
+    <message>
+        <source>It is not recommended to call tr() from within a constructor &apos;%1::%2&apos;
+</source>
+        <translation>Не рекомендовано викликати tr() з конструктора &apos;%1::%2&apos;
+</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring
+</source>
+        <translation>//% не може бути використаний разом з translate() / QT_TRANSLATE_NOOP(). Ігнорую
+</translation>
+    </message>
+    <message>
+        <source>//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring
+</source>
+        <translation>//= не може бути використаний разом з qtTrId() / QT_TRID_NOOP(). Ігнорую
+</translation>
+    </message>
+    <message>
+        <source>Unexpected character in meta string
+</source>
+        <translation>Неочікуваний символ в мета-рядку
+</translation>
+    </message>
+    <message>
+        <source>Unterminated meta string
+</source>
+        <translation>Незавершений мета-рядок
+</translation>
+    </message>
+    <message>
+        <source>Cannot invoke tr() like this
+</source>
+        <translation>Неможливо викликати tr() подібним чином
+</translation>
+    </message>
+    <message>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation>Відкидаю невжиті мета-дані
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Незбалансовані відкриваючі фігурні дужки в коді C++ (або неправильне застосування препроцесора C++)
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Незбалансовані відкриваючі круглі дужки в коді C++ (або неправильне застосування препроцесора C++)
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation>Незбалансовані відкриваючі квадратні дужки в коді C++ (або неправильне застосування препроцесора C++)
+</translation>
+    </message>
+    <message>
+        <source>Unterminated Java comment.
+</source>
+        <translation>Незавершений коментар Java.
+</translation>
+    </message>
+    <message>
+        <source>Invalid Unicode value.
+</source>
+        <translation>Неправильне значення Unicode.
+</translation>
+    </message>
+    <message>
+        <source>Unterminated string.
+</source>
+        <translation>Незавершений рядок.
+</translation>
+    </message>
+    <message>
+        <source>String used in translation can contain only literals concatenated with other literals, not expressions or numbers.
+</source>
+        <translation>Рядки, що використовуються в перекладі, можуть містити лише літерали об&apos;єднані з іншими літералами, а не вирази або числа.
+</translation>
+    </message>
+    <message>
+        <source>&apos;class&apos; must be followed by a class name.
+</source>
+        <translation>Після &apos;class&apos; повинна слідувати назва класу.
+</translation>
+    </message>
+    <message>
+        <source>Excess closing brace.
+</source>
+        <translation>Забагато закриваючих фігурних дужок.</translation>
+    </message>
+    <message>
+        <source>&apos;package&apos; must be followed by package name.
+</source>
+        <translation>Після &apos;package&apos; повинна слідувати назва пакунку.
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace.
+</source>
+        <translation>Незбалансовані відкриваючі фігурні дужки.
+</translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis.
+</source>
+        <translation>Незбалансовані відкриваючі круглі дужки.
+</translation>
+    </message>
+    <message numerus="yes">
+        <source>    Found %n source text(s) (%1 new and %2 already existing)
+</source>
+        <translation>
+            <numerusform>    Знайдено %n оригінальний текст (%1 новий та %2 вже існує)
+</numerusform>
+            <numerusform>    Знайдено %n оригінальних тексти (%1 нових та %2 вже існує)
+</numerusform>
+            <numerusform>    Знайдено %n оригінальних текстів (%1 нових та %2 вже існує)
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Removed %n obsolete entries
+</source>
+        <translation>
+            <numerusform>    Видалено %n застарілий елемент
+</numerusform>
+            <numerusform>    Видалено %n застарілих елементи
+</numerusform>
+            <numerusform>    Видалено %n застарілих елементів
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Kept %n obsolete entries
+</source>
+        <translation>
+            <numerusform>    Залишено %n застарілий елемент
+</numerusform>
+            <numerusform>    Залишено %n застарілих елементи
+</numerusform>
+            <numerusform>    Залишено %n застарілих елементів
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Number heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>Числова евристика надала %n переклад
+</numerusform>
+            <numerusform>Числова евристика надала %n переклади
+</numerusform>
+            <numerusform>Числова евристика надала %n перекладів
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Same-text heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>Евристика &quot;однаковий текст&quot; надала %n переклад
+</numerusform>
+            <numerusform>Евристика &quot;однаковий текст&quot; надала %n переклади
+</numerusform>
+            <numerusform>Евристика &quot;однаковий текст&quot; надала %n перекладів
+</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Similar-text heuristic provided %n translation(s)
+</source>
+        <translation>
+            <numerusform>Евристика &quot;схожий текст&quot; надала %n переклад
+</numerusform>
+            <numerusform>Евристика &quot;схожий текст&quot; надала %n переклади
+</numerusform>
+            <numerusform>Евристика &quot;схожий текст&quot; надала %n перекладів
+</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Illegal character</source>
+        <translation>Неприпустимий символ</translation>
+    </message>
+    <message>
+        <source>Unclosed string at end of line</source>
+        <translation>Незакритий рядок в кінці файлу</translation>
+    </message>
+    <message>
+        <source>Illegal escape squence</source>
+        <translation>Неприпустима керуюча послідовність</translation>
+    </message>
+    <message>
+        <source>Illegal unicode escape sequence</source>
+        <translation>Неприпустима керуюча послідовність Unicode</translation>
+    </message>
+    <message>
+        <source>Unclosed comment at end of file</source>
+        <translation>Незакритий коментар в кінці файлу</translation>
+    </message>
+    <message>
+        <source>Illegal syntax for exponential number</source>
+        <translation>Неприпустимий синтаксис для експоненційного числа</translation>
+    </message>
+    <message>
+        <source>Identifier cannot start with numeric literal</source>
+        <translation>Ідентифікатор не може починатись з числового літералу</translation>
+    </message>
+    <message>
+        <source>Unterminated regular expression literal</source>
+        <translation>Незавершений літерал регулярного виразу</translation>
+    </message>
+    <message>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation>//% не може бути використаний разом з %1(). Ігнорую
+</translation>
+    </message>
+    <message>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation>%1() вимагає щонайменше двох аргументів.
+</translation>
+    </message>
+    <message>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation>%1(): обидва аргументи повинні бути рядковими літералами.
+</translation>
+    </message>
+    <message>
+        <source>%1() requires at least one argument.
+</source>
+        <translation>%1() вимагає щонайменше одного аргументу.
+</translation>
+    </message>
+    <message>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation>%1(): текст для перекладу повинен бути рядковим літералом.
+</translation>
+    </message>
+    <message>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation>//= не може бути використаний разом з %1(). Ігнорую
+</translation>
+    </message>
+    <message>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation>%1(): ідентифікатор повинен бути рядковим літералом.
+</translation>
+    </message>
+    <message>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation>Очікувалось </translation>
+    </message>
+    <message>
+        <source>XML error: Parse error at line %1, column %2 (%3).</source>
+        <translation>Помилка XML: Помилка розбору в рядку %1, позиція %2 (%3).</translation>
+    </message>
+    <message>
+        <source>Parse error in UI file</source>
+        <translation>Помилка розбору файлу UI</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -1431,6 +2222,13 @@ Line: %2</source>
     </message>
 </context>
 <context>
+    <name>PhraseBook</name>
+    <message>
+        <source>Parse error at line %1, column %2 (%3).</source>
+        <translation>Помилка розбору в рядку %1, позиція %2 (%3).</translation>
+    </message>
+</context>
+<context>
     <name>PhraseBookBox</name>
     <message>
         <source>Edit Phrase Book</source>
@@ -1558,83 +2356,6 @@ Line: %2</source>
     </message>
 </context>
 <context>
-    <name>QCoreApplication</name>
-    <message>
-        <source>Usage:
-    lrelease [options] project-file
-    lrelease [options] ts-files [-qm qm-file]
-
-lrelease is part of Qt&apos;s Linguist tool chain. It can be used as a
-stand-alone tool to convert XML-based translations files in the TS
-format into the &apos;compiled&apos; QM format used by QTranslator objects.
-
-Options:
-    -help  Display this information and exit
-    -idbased
-           Use IDs instead of source strings for message keying
-    -compress
-           Compress the QM files
-    -nounfinished
-           Do not include unfinished translations
-    -removeidentical
-           If the translated text is the same as
-           the source text, do not include the message
-    -markuntranslated &lt;prefix&gt;
-           If a message has no real translation, use the source text
-           prefixed with the given string instead
-    -silent
-           Do not explain what is being done
-    -version
-           Display the version of lrelease and exit
-</source>
-        <translation>Використання:
-    lrelease [опції] файл-проект
-    lrelease [опції] файли-ts [-qm файл-qm]
-
-lrelease - це частина набору програм Qt Linguist. Вона може використовуватися
-як окремий засіб для перетворення файлів перекладу на базі XML в форматі TS
-до &apos;скомпільованого&apos; формату QM, що використовується об&apos;єктами QTranslator.
-
-Опції:
-    -help  Показати цю інформацію та вийти
-    -idbased
-           Використовувати ID замість рядків оригіналу як ключі повідомлень
-    -compress
-           Стискати файли QM
-    -nounfinished
-           Не включати незавершені переклади
-    -removeidentical
-           Якщо перекладений текст однаковий з оригіналом, то
-           не включати повідомлення
-    -markuntranslated &lt;prefix&gt;
-           If a message has no real translation, use the source text
-           prefixed with the given string instead
-    -silent
-           Не пояснювати, що відбувається
-    -version
-           Показати версію lrelease та вийти
-</translation>
-    </message>
-    <message>
-        <source>Updating &apos;%1&apos;...
-</source>
-        <translation>Оновлюю &apos;%1&apos;...
-</translation>
-    </message>
-    <message>
-        <source>Removing translations equal to source text in &apos;%1&apos;...
-</source>
-        <translation>Видалення перекладів однакових з оригінальним текстом в &apos;%1&apos;...
-</translation>
-    </message>
-    <message>
-        <source>lrelease version %1
-</source>
-        <translation>lrelease версії %1
-</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Translation files (%1);;</source>
@@ -1681,215 +2402,11 @@ lrelease - це частина набору програм Qt Linguist. Вона
         <translation>Файли локалізації XLIFF</translation>
     </message>
     <message>
-        <source>Usage:
-    lupdate [options] [project-file]...
-    lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
-
-lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
-messages from Qt UI files, C++, Java and JavaScript/QtScript source code.
-Extracted messages are stored in textual translation source files (typically
-Qt TS XML). New and modified messages can be merged into existing TS files.
-
-Options:
-    -help  Display this information and exit.
-    -no-obsolete
-           Drop all obsolete strings.
-    -extensions &lt;ext&gt;[,&lt;ext&gt;]...
-           Process files with the given extensions only.
-           The extension list must be separated with commas, not with whitespace.
-           Default: &apos;%1&apos;.
-    -pluralonly
-           Only include plural form messages.
-    -silent
-           Do not explain what is being done.
-    -no-sort
-           Do not sort contexts in TS files.
-    -no-recursive
-           Do not recursively scan the following directories.
-    -recursive
-           Recursively scan the following directories (default).
-    -I &lt;includepath&gt; or -I&lt;includepath&gt;
-           Additional location to look for include files.
-           May be specified multiple times.
-    -locations {absolute|relative|none}
-           Specify/override how source code references are saved in TS files.
-           Default is absolute.
-    -no-ui-lines
-           Do not record line numbers in references to UI files.
-    -disable-heuristic {sametext|similartext|number}
-           Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
-    -source-language &lt;language&gt;[_&lt;region&gt;]
-           Specify the language of the source strings for new files.
-           Defaults to POSIX if not specified.
-    -target-language &lt;language&gt;[_&lt;region&gt;]
-           Specify the language of the translations for new files.
-           Guessed from the file name if not specified.
-    -ts &lt;ts-file&gt;...
-           Specify the output file(s). This will override the TRANSLATIONS
-           and nullify the CODECFORTR from possibly specified project files.
-    -codecfortr &lt;codec&gt;
-           Specify the codec assumed for tr() calls. Effective only with -ts.
-    -version
-           Display the version of lupdate and exit.
-    @lst-file
-           Read additional file names (one per line) from lst-file.
-</source>
-        <translation>Використання:
-    lupdate [опції] [файл-проект]...
-    lupdate [опції] [вхідний-файл|шлях|@файл-список]... -ts ts-файли|@файл-список
-
-lupdate - це частина набору програм Qt Linguist. Вона It витягає придатні для перекладу 
-повідомлення з файлів Qt UI, коду C++, Java та JavaScript/QtScript. Витягнуті повідомлення
-зберігаються в текстовому файлі перекладу (типово Qt TS XML). Нові та модифіковані 
-повідомлення можуть бути об&apos;єднанні з існуючими файлами TS.
-
-Опції:
-    -help  Показати цю інформацію та вийти.
-    -no-obsolete
-           Видалити всі застарілі рядки.
-    -extensions &lt;розширення&gt;[,&lt;розширення&gt;]...
-           Обробляти файли лише з вказаними розширеннями.
-           Список розширень має розділюватись комами, а не пропусками.
-           Типово: &apos;%1&apos;.
-    -pluralonly
-           Включати лише повідомлення з формою множини.
-    -silent
-           Не пояснювати, що відбувається.
-    -no-sort
-           Не сортувати контексти в файлах TS.
-    -no-recursive
-           Не сканувати рекурсивно наступні теки.
-    -recursive
-           Рекурсивно сканувати наступні теки (типово).
-    -I &lt;шлях-включення&gt; або -I&lt;шлях-включення&gt;
-           Додаткові місця для пошуку файлів включення.
-           Може бути вказано декілька разів.
-    -locations {absolute|relative|none}
-           Вказати/замістити як посилання на код зберігаються в файлі TS.
-           Типово - абсолютно.
-    -no-ui-lines
-           Не записувати номери рядків в посиланнях на файли UI.
-    -disable-heuristic {sametext|similartext|number}
-           Вимкнути вказану евристику об&apos;єдання. Може бути вказано декілька разів.
-    -pro &lt;ім&apos;я-файлу&gt;
-           Ім&apos;я .pro файлу. Корисно для файлів із синтаксисом фалів .pro, але з
-           іншим розширенням. Projects are recursed into and merged.
-    -source-language &lt;мова&gt;[_&lt;регіон&gt;]
-           Вказати мову оригінальних рядків для нових файлів.
-           Типово, якщо не вказано - POSIX.
-    -target-language &lt;мова&gt;[_&lt;регіон&gt;]
-           Вказати мову перекладу для нових файлів.
-           Вгадується з імені файла, якщо не вказано.
-    -ts &lt;файл-ts&gt;...
-           Вказати вихідний файл(и). Це замістить TRANSLATIONS
-           та скине CODECFORTR з, можливо, вказаних файлів проекту.
-    -codecfortr &lt;кодек&gt;
-           Вказати кодек, що Specify the codec вживається для викликів tr(). Ефективно лише з -ts.
-    -version
-           Показати версію lupdate та вийти.
-    @файл-список
-           Читати додаткові імена файлів (одне на рядок) з файла-списку.
-</translation>
-    </message>
-    <message>
-        <source>Updating &apos;%1&apos;...
-</source>
-        <translation>Оновлюю &apos;%1&apos;...
-</translation>
-    </message>
-    <message>
-        <source>Stripping non plural forms in &apos;%1&apos;...
-</source>
-        <translation>Видалення не множинних форм в &apos;%1&apos;...
-</translation>
-    </message>
-    <message>
         <source>lupdate version %1
 </source>
         <translation>lupdate версії %1
 </translation>
     </message>
-    <message>
-        <source>Scanning directory &apos;%1&apos;...
-</source>
-        <translation>Сканування теки &apos;%1&apos;...
-</translation>
-    </message>
-    <message numerus="yes">
-        <source>    Found %n source text(s) (%1 new and %2 already existing)
-</source>
-        <translation>
-            <numerusform>    Знайдено %n оригінальний текст (%1 новий та %2 вже існує)
-</numerusform>
-            <numerusform>    Знайдено %n оригінальних тексти (%1 нових та %2 вже існує)
-</numerusform>
-            <numerusform>    Знайдено %n оригінальних текстів (%1 нових та %2 вже існує)
-</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>    Removed %n obsolete entries
-</source>
-        <translation>
-            <numerusform>    Видалено %n застарілий елемент
-</numerusform>
-            <numerusform>    Видалено %n застарілих елементи
-</numerusform>
-            <numerusform>    Видалено %n застарілих елементів
-</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>    Kept %n obsolete entries
-</source>
-        <translation>
-            <numerusform>    Залишено %n застарілий елемент
-</numerusform>
-            <numerusform>    Залишено %n застарілих елементи
-</numerusform>
-            <numerusform>    Залишено %n застарілих елементів
-</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>    Number heuristic provided %n translation(s)
-</source>
-        <translation>
-            <numerusform>Числова евристика надала %n переклад
-</numerusform>
-            <numerusform>Числова евристика надала %n переклади
-</numerusform>
-            <numerusform>Числова евристика надала %n перекладів
-</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>    Same-text heuristic provided %n translation(s)
-</source>
-        <translation>
-            <numerusform>Евристика &quot;однаковий текст&quot; надала %n переклад
-</numerusform>
-            <numerusform>Евристика &quot;однаковий текст&quot; надала %n переклади
-</numerusform>
-            <numerusform>Евристика &quot;однаковий текст&quot; надала %n перекладів
-</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>    Similar-text heuristic provided %n translation(s)
-</source>
-        <translation>
-            <numerusform>Евристика &quot;схожий текст&quot; надала %n переклад
-</numerusform>
-            <numerusform>Евристика &quot;схожий текст&quot; надала %n переклади
-</numerusform>
-            <numerusform>Евристика &quot;схожий текст&quot; надала %n перекладів
-</numerusform>
-        </translation>
-    </message>
 </context>
 <context>
     <name>SourceCodeView</name>
diff --git a/translations/qt_help_uk.ts b/translations/qt_help_uk.ts
index b8bc984526..32e47b4441 100644
--- a/translations/qt_help_uk.ts
+++ b/translations/qt_help_uk.ts
@@ -106,7 +106,7 @@
     <name>QHelpEngineCore</name>
     <message>
         <source>Cannot open documentation file %1: %2!</source>
-        <translation>Не можу відкрити файл документації %1: %2!</translation>
+        <translation>Неможливо відкрити файл документації %1: %2!</translation>
     </message>
     <message>
         <source>The specified namespace does not exist!</source>
@@ -256,7 +256,7 @@
     </message>
     <message>
         <source>The input file %1 could not be opened!</source>
-        <translation>Неможливо відкрити вхідний файл %1!</translation>
+        <translation>Не вдалось відкрити вхідний файл %1!</translation>
     </message>
 </context>
 <context>
diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts
index 7a223f49e8..e1716fbe67 100644
--- a/translations/qt_uk.ts
+++ b/translations/qt_uk.ts
@@ -1697,25 +1697,6 @@ to
     </message>
 </context>
 <context>
-    <name>QDeclarativeCompositeTypeManager</name>
-    <message>
-        <source>Resource %1 unavailable</source>
-        <translation>Ресурс %1 недоступний</translation>
-    </message>
-    <message>
-        <source>Namespace %1 cannot be used as a type</source>
-        <translation>Простір імен %1 не може бути використаний як тип</translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <translation>%1 %2</translation>
-    </message>
-    <message>
-        <source>Type %1 unavailable</source>
-        <translation>Тип %1 недоступний</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeConnections</name>
     <message>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
@@ -2096,6 +2077,25 @@ to
     </message>
 </context>
 <context>
+    <name>QDeclarativeTypeData</name>
+    <message>
+        <source>Script %1 unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type %1 unavailable</source>
+        <translation type="unfinished">Тип %1 недоступний</translation>
+    </message>
+    <message>
+        <source>Namespace %1 cannot be used as a type</source>
+        <translation type="unfinished">Простір імен %1 не може бути використаний як тип</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <translation type="unfinished">%1 %2</translation>
+    </message>
+</context>
+<context>
     <name>QDeclarativeVME</name>
     <message>
         <source>Unable to create object of type %1</source>
@@ -3313,18 +3313,10 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QLibrary</name>
     <message>
-        <source>Could not mmap &apos;%1&apos;: %2</source>
-        <translation>Не вдалося виконати mmap &apos;%1&apos;: %2</translation>
-    </message>
-    <message>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation>Дані верифікації додатку не збігаються для ’%1’</translation>
     </message>
     <message>
-        <source>Could not unmap &apos;%1&apos;: %2</source>
-        <translation>Не вдалося виконати unmap &apos;%1&apos;: %2</translation>
-    </message>
-    <message>
         <source>The shared library was not found.</source>
         <translation>Динамічна бібліотека не знайдена.</translation>
     </message>
@@ -7917,7 +7909,7 @@ Do you want to overwrite it?</source>
     <name>QtXmlPatterns</name>
     <message>
         <source>%1 is an unsupported encoding.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кодування %1 не підтримується.</translation>
     </message>
     <message>
         <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
@@ -7941,23 +7933,23 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Year %1 is invalid because it begins with %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Рік %1 неправильний, бо він починається з %2.</translation>
     </message>
     <message>
         <source>Day %1 is outside the range %2..%3.</source>
-        <translation type="unfinished"></translation>
+        <translation>День %1 поза межами діапазону %2..%3.</translation>
     </message>
     <message>
         <source>Month %1 is outside the range %2..%3.</source>
-        <translation type="unfinished"></translation>
+        <translation>Місяць %1 поза межами діапазону %2..%3.</translation>
     </message>
     <message>
         <source>Overflow: Can&apos;t represent date %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Переповнення: Не можу представити дату %1.</translation>
     </message>
     <message>
         <source>Day %1 is invalid for month %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Неправильний день %1 для місяця %2.</translation>
     </message>
     <message>
         <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source>
@@ -7965,15 +7957,15 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Time %1:%2:%3.%4 is invalid.</source>
-        <translation type="unfinished"></translation>
+        <translation>Неправильний час %1:%2:%3.%4.</translation>
     </message>
     <message>
         <source>Overflow: Date can&apos;t be represented.</source>
-        <translation type="unfinished"></translation>
+        <translation>Переповнення: Не можу представити дату.</translation>
     </message>
     <message>
         <source>At least one component must be present.</source>
-        <translation type="unfinished"></translation>
+        <translation>Щонайменше один компонент має бути присутнім.</translation>
     </message>
     <message>
         <source>At least one time component must appear after the %1-delimiter.</source>
@@ -7981,7 +7973,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>%1 is not a valid value of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не є правильним значенням для типу %2.</translation>
     </message>
     <message>
         <source>When casting to %1 from %2, the source value cannot be %3.</source>
@@ -7989,11 +7981,11 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Integer division (%1) by zero (%2) is undefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Цілочисельне ділення (%1) на нуль (%2) не визначене.</translation>
     </message>
     <message>
         <source>Division (%1) by zero (%2) is undefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ділення (%1) на нуль (%2) не визначене.</translation>
     </message>
     <message>
         <source>Modulus division (%1) by zero (%2) is undefined.</source>
@@ -8021,11 +8013,11 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Value %1 of type %2 exceeds maximum (%3).</source>
-        <translation type="unfinished"></translation>
+        <translation>Значення %1 типу %2 перевищує максимум (%3).</translation>
     </message>
     <message>
         <source>Value %1 of type %2 is below minimum (%3).</source>
-        <translation type="unfinished"></translation>
+        <translation>Значення %1 типу %2 менше за мінімум (%3).</translation>
     </message>
     <message>
         <source>A value of type %1 must contain an even number of digits. The value %2 does not.</source>
@@ -8033,7 +8025,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>%1 is not valid as a value of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не є правильним значенням для типу %2.</translation>
     </message>
     <message>
         <source>Ambiguous rule match.</source>
@@ -8041,11 +8033,11 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Operator %1 cannot be used on type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Оператор %1 не може використовуватись для типу %2.</translation>
     </message>
     <message>
         <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>Оператор %1 не може використовуватись для атомарних значень типу %2 та %3.</translation>
     </message>
     <message>
         <source>The namespace URI in the name for a computed attribute cannot be %1.</source>
@@ -8065,11 +8057,11 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>A comment cannot contain %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Коментар не може містити %1</translation>
     </message>
     <message>
         <source>A comment cannot end with a %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Коментар не може закінчувати на %1.</translation>
     </message>
     <message>
         <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source>
@@ -8081,7 +8073,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>The prefix %1 cannot be bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>Неможливо прив&apos;язати префікс %1.</translation>
     </message>
     <message>
         <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
@@ -8147,12 +8139,16 @@ Do you want to overwrite it?</source>
         <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%1 requires at least %n argument(s). %2 is therefore invalid.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
     <message>
@@ -8169,7 +8165,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>%1 is not a valid XML 1.0 character.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не є правильним символом XML 1.0.</translation>
     </message>
     <message>
         <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source>
@@ -8257,11 +8253,11 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>The item %1 did not match the required type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Елемент %1 не відповідає необхідному типу %2.</translation>
     </message>
     <message>
         <source>The variable %1 is unused</source>
-        <translation type="unfinished"></translation>
+        <translation>Змінна %1 не використовується</translation>
     </message>
     <message>
         <source>W3C XML Schema identity constraint selector</source>
@@ -8301,7 +8297,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
-        <translation type="unfinished"></translation>
+        <translation>Версія %1 не підтримується. Підтримується XQuery версії 1.0.</translation>
     </message>
     <message>
         <source>The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.</source>
@@ -8357,7 +8353,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>The module import feature is not supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Можливість імпорту модулів не підтримується</translation>
     </message>
     <message>
         <source>A variable with name %1 has already been declared.</source>
@@ -8517,7 +8513,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Parse error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Помилка розбору: %1</translation>
     </message>
     <message>
         <source>The value of the XSL-T version attribute must be a value of type %1, which %2 isn&apos;t.</source>
@@ -8529,7 +8525,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Unknown XSL-T attribute %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Невідомий атрибут XSL-T %1.</translation>
     </message>
     <message>
         <source>Attribute %1 and %2 are mutually exclusive.</source>
@@ -9041,11 +9037,11 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>Атрибут %1 елемента %2 містить неправильний вміст: {%3} не є значенням типу %4.</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element contains invalid content: {%3}.</source>
-        <translation type="unfinished"></translation>
+        <translation>Атрибут %1 елемента %2 містить неправильний вміст: {%3}.</translation>
     </message>
     <message>
         <source>Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.</source>
@@ -9077,7 +9073,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>%1 attribute of %2 element must be %3 or %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>Атрибут %1 елемента %2 має бути %3 або %4.</translation>
     </message>
     <message>
         <source>%1 attribute of %2 element must have a value of %3.</source>
@@ -9157,7 +9153,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Type %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Тип %1 вже визначено.</translation>
     </message>
     <message>
         <source>Attribute group %1 already defined.</source>
@@ -9297,7 +9293,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>%1 is not valid according to %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не є правильним відповідно до %2.</translation>
     </message>
     <message>
         <source>String content does not match the length facet.</source>
@@ -9697,7 +9693,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>zero or one</source>
-        <translation type="unfinished"></translation>
+        <translation>нуль чи один</translation>
     </message>
     <message>
         <source>exactly one</source>
@@ -9705,15 +9701,15 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>one or more</source>
-        <translation type="unfinished"></translation>
+        <translation>один чи більше</translation>
     </message>
     <message>
         <source>zero or more</source>
-        <translation type="unfinished"></translation>
+        <translation>нуль чи більше</translation>
     </message>
     <message>
         <source>Required type is %1, but %2 was found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вимагається тип %1, але знайдено %2.</translation>
     </message>
     <message>
         <source>Promoting %1 to %2 may cause loss of precision.</source>
@@ -9721,7 +9717,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>The focus is undefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Фокус не визначено.</translation>
     </message>
     <message>
         <source>It&apos;s not possible to add attributes after any other kind of node.</source>
diff --git a/translations/qvfb_uk.ts b/translations/qvfb_uk.ts
index 0e0c5da620..e857e9deb8 100644
--- a/translations/qvfb_uk.ts
+++ b/translations/qvfb_uk.ts
@@ -215,7 +215,7 @@
     <name>DeviceSkin</name>
     <message>
         <source>The image file &apos;%1&apos; could not be loaded.</source>
-        <translation>Неможливо завантажити файл зображення &apos;%1&apos;.</translation>
+        <translation>Не вдалось завантажити файл зображення &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
@@ -223,11 +223,11 @@
     </message>
     <message>
         <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
-        <translation>Неможливо відкрити файл налаштувань &apos;%1&apos;.</translation>
+        <translation>Не вдалось відкрити файл налаштувань обкладинки &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
-        <translation>Неможливо прочитати файл налаштувань &apos;%1&apos;: %2</translation>
+        <translation>Не вдалось прочитати файл налаштувань обкладинки &apos;%1&apos;: %2</translation>
     </message>
     <message>
         <source>Syntax error: %1</source>
@@ -261,6 +261,126 @@
 <context>
     <name>QVFb</name>
     <message>
+        <source>&amp;File</source>
+        <translation>&amp;Файл</translation>
+    </message>
+    <message>
+        <source>&amp;Configure...</source>
+        <translation>&amp;Налаштувати...</translation>
+    </message>
+    <message>
+        <source>&amp;Save image...</source>
+        <translation>&amp;Зберегти зображення...</translation>
+    </message>
+    <message>
+        <source>&amp;Animation...</source>
+        <translation>&amp;Анімація...</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>Ви&amp;йти</translation>
+    </message>
+    <message>
+        <source>&amp;View</source>
+        <translation>&amp;Вид</translation>
+    </message>
+    <message>
+        <source>Show &amp;Cursor</source>
+        <translation>Показувати &amp;курсор</translation>
+    </message>
+    <message>
+        <source>&amp;Refresh Rate...</source>
+        <translation>Швидкість &amp;оновлення...</translation>
+    </message>
+    <message>
+        <source>&amp;No rotation</source>
+        <translation>&amp;Без обертання</translation>
+    </message>
+    <message>
+        <source>&amp;90° rotation</source>
+        <translation>Обернути на &amp;90°</translation>
+    </message>
+    <message>
+        <source>1&amp;80° rotation</source>
+        <translation>Обернути на 1&amp;80°</translation>
+    </message>
+    <message>
+        <source>2&amp;70° rotation</source>
+        <translation>Обернути на 2&amp;70°</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;0.5</source>
+        <translation>Коефіцієнт масштабування &amp;0.5</translation>
+    </message>
+    <message>
+        <source>Zoom scale 0.7&amp;5</source>
+        <translation>Коефіцієнт масштабування 0.7&amp;5</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;1</source>
+        <translation>Коефіцієнт масштабування &amp;1</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;2</source>
+        <translation>Коефіцієнт масштабування &amp;2</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;3</source>
+        <translation>Коефіцієнт масштабування &amp;3</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;4</source>
+        <translation>Коефіцієнт масштабування &amp;4</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;scale...</source>
+        <translation>Коефіцієнт &amp;масштабування...</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Довідка</translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation>&amp;Про...</translation>
+    </message>
+    <message>
+        <source>Save Main Screen image</source>
+        <translation>Зберегти зображення головного екрану</translation>
+    </message>
+    <message>
+        <source>snapshot.png</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Portable Network Graphics (*.png)</source>
+        <translation>Переносима мережева графіка (*.png)</translation>
+    </message>
+    <message>
+        <source>Save Main Screen Image</source>
+        <translation>Зберегти зображення головного екрану</translation>
+    </message>
+    <message>
+        <source>Save failed. Check that you have permission to write to the target directory.</source>
+        <translation>Збій збереження. Перевірте чи маєте ви право на запис в теку збереження.</translation>
+    </message>
+    <message>
+        <source>Save Second Screen image</source>
+        <translation>Зберегти зображення другого екрану</translation>
+    </message>
+    <message>
+        <source>Save Second Screen Image</source>
+        <translation>Зберегти зображення другого екрану</translation>
+    </message>
+    <message>
+        <source>About QVFB</source>
+        <translation>Про QVFB</translation>
+    </message>
+    <message>
+        <source>&lt;h2&gt;The Qt for Embedded Linux Virtual X11 Framebuffer&lt;/h2&gt;&lt;p&gt;This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. &lt;p&gt;With the aid of this development tool, you can develop Qt for Embedded  Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers.</source>
+        <translation>&lt;h2&gt;Віртуальний фреймбуфер X11 Qt для Embedded Linux&lt;/h2&gt;&lt;p&gt;Ця програма виконується під Qt для X11, емулюючи простий фреймбуфер, до якого сервер та клієнти Qt для Embedded Linux можуть приєднуватись так само, як би це був апаратний фреймбуфер Linux. &lt;p&gt;За допомогою цього інструменту ви можете розробляти програми Qt для Embedded Linux під X11, без потреби перемикатись на віртуальну консоль. Це означає, що ви можете зручно використовувати інші ваші інструменти розробки, такі як профайлери та зневаджувачі з графічним інтерфейсом користувача.</translation>
+    </message>
+    <message>
         <source>Browse...</source>
         <translation>Оглянути...</translation>
     </message>
@@ -273,4 +393,23 @@
         <translation>Усі обкладинки QVFB (*.skin)</translation>
     </message>
 </context>
+<context>
+    <name>QVFbRateDialog</name>
+    <message>
+        <source>Target frame rate:</source>
+        <translation>Швидкість оновлення:</translation>
+    </message>
+    <message>
+        <source>%1fps</source>
+        <translation>%1 кадрів в секунду</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+</context>
 </TS>