Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

191 files changed, 5950 insertions, 3078 deletions

diff --git a/.gitignore b/.gitignore
index 33c9b7c606..2069ad58fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,7 +93,6 @@ tests/auto/qprocess/fileWriterProcess.txt
 .com.apple.timemachine.supported
 tests/auto/qlibrary/libmylib.so*
 tests/auto/qresourceengine/runtime_resource.rcc
-tools/qdoc3/qdoc3*
 tools/qtestlib/updater/updater*
 tools/activeqt/testcon/testcon.tlb
 translations/*.qm
diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
index 1307c4e530..f1092f8513 100644
--- a/config.tests/unix/alsa/alsatest.cpp
+++ b/config.tests/unix/alsa/alsatest.cpp
@@ -40,8 +40,11 @@
 ****************************************************************************/
 
 #include <alsa/asoundlib.h>
+#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
+#error "Alsa version found too old, require >= 1.0.10"
+#endif
+
 int main(int argc,char **argv)
 {
-    return 0;
 }
 
diff --git a/configure b/configure
index 486dc0c2c0..6547318cde 100755
--- a/configure
+++ b/configure
@@ -662,6 +662,7 @@ CFG_RELEASE_QMAKE=no
 CFG_PHONON=auto
 CFG_PHONON_BACKEND=yes
 CFG_MULTIMEDIA=yes
+CFG_AUDIO_BACKEND=yes
 CFG_SVG=yes
 CFG_DECLARATIVE=auto
 CFG_WEBKIT=auto # (yes|no|auto)
@@ -712,6 +713,7 @@ CFG_PTMALLOC=no
 CFG_STL=auto
 CFG_PRECOMPILE=auto
 CFG_SEPARATE_DEBUG_INFO=auto
+CFG_SEPARATE_DEBUG_INFO_NOCOPY=no
 CFG_REDUCE_EXPORTS=auto
 CFG_MMX=auto
 CFG_3DNOW=auto
@@ -904,7 +906,7 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style yes options
-        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config)
+        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL=yes
         ;;
@@ -1543,6 +1545,9 @@ while [ "$#" -gt 0 ]; do
     separate-debug-info)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             CFG_SEPARATE_DEBUG_INFO="$VAL"
+        elif [ "$VAL" = "nocopy" ] ; then
+            CFG_SEPARATE_DEBUG_INFO="yes"
+            CFG_SEPARATE_DEBUG_INFO_NOCOPY="yes"
         else
             UNKNOWN_OPT=yes
         fi
@@ -2068,6 +2073,13 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
+    audio-backend)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_AUDIO_BACKEND="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
     *)
         UNKNOWN_OPT=yes
         ;;
@@ -2894,7 +2906,7 @@ fi
 
 # pass on $CFG_SDK to the configure tests.
 if [ '!' -z "$CFG_SDK" ]; then
-    MAC_CONFIG_TEST_COMMANDLINE="-sdk $CFG_SDK"
+    MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -sdk $CFG_SDK"
 fi
 
 # find the default framework value
@@ -3259,7 +3271,7 @@ Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
         [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
         [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
         [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
-        [-no-openssl] [-openssl] [-openssl-linked]
+        [-no-audio-backend] [-audio-backend] [-no-openssl] [-openssl] [-openssl-linked]
         [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit]
         [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative]
 
@@ -3397,6 +3409,9 @@ fi
     -no-multimedia ..... Do not build the QtMultimedia module.
  +  -multimedia ........ Build the QtMultimedia module.
 
+    -no-audio-backend .. Do not build the platform audio backend into QtMultimedia.
+ +  -audio-backend ..... Build the platform audio backend into QtMultimedia if available.
+
     -no-phonon ......... Do not build the Phonon module.
  +  -phonon ............ Build the Phonon module.
                          Phonon is built if a decent C++ compiler is used.
@@ -6083,6 +6098,9 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
     QMakeVar add QMAKE_CXXFLAGS -g
     QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info"
 fi
+if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then
+    QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info_nocopy"
+fi
 [ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx"
 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
@@ -6444,6 +6462,10 @@ else
     QT_CONFIG="$QT_CONFIG multimedia"
 fi
 
+if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG audio-backend"
+fi
+
 if [ "$CFG_SVG" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG svg"
 else
diff --git a/configure.exe b/configure.exe
index 351ed040b7..a410efc8d3 100755..100644
--- a/configure.exe
+++ b/configure.exe
diff --git a/demos/demos.pro b/demos/demos.pro
index a943bfd230..5a9b6dbede 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -20,7 +20,24 @@ symbian: SUBDIRS = \
             demos_shared \
             demos_deform \
             demos_pathstroke
-
+            
+wince*:  SUBDIRS = \
+            demos_shared \
+            demos_deform \
+            demos_gradients \
+            demos_pathstroke \
+            demos_affine \
+            demos_composition \
+            demos_books \
+            demos_interview \
+            demos_mainwindow \
+            demos_spreadsheet \
+            demos_textedit \
+            # demos_chip \
+            demos_embeddeddialogs \
+            demos_undo \
+            demos_sub-attaq
+            
 contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{
 SUBDIRS += demos_boxes
 }
@@ -33,7 +50,7 @@ wince*|symbian|embedded|x11: SUBDIRS += embedded
 !cross_compile:{
 contains(QT_BUILD_PARTS, tools):{
 !wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo
-wince*: SUBDIRS += demos_sqlbrowser
+wince*:SUBDIRS += demos_sqlbrowser
 }
 }
 contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer
diff --git a/demos/embedded/weatherinfo/weatherinfo.cpp b/demos/embedded/weatherinfo/weatherinfo.cpp
index 842f05bbe1..3b78a5f5f7 100644
--- a/demos/embedded/weatherinfo/weatherinfo.cpp
+++ b/demos/embedded/weatherinfo/weatherinfo.cpp
@@ -105,9 +105,8 @@ private slots:
     void delayedInit() {
 #if defined(Q_OS_SYMBIAN)
         qt_SetDefaultIap();
-#else
-        request("Oslo");
 #endif
+        request("Oslo");
     }
 
 private slots:
diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc
index 8de500e630..5a30e43aa7 100644
--- a/doc/src/development/assistant-manual.qdoc
+++ b/doc/src/development/assistant-manual.qdoc
@@ -130,7 +130,7 @@
             \o -collectionFile <file.qhc>
             \o Uses the specified collection file instead of the default one.
         \row
-            \o -showUrl URL
+            \o -showUrl <URL>
             \o Shows the document referenced by URL.
         \row
             \o -enableRemoteControl
@@ -156,7 +156,12 @@
             \o Unregisters the specified compressed help file from the given
             collection file.
         \row
-            \o -setCurrentFilter filter
+            \o -remove-search-index
+            \o Purges the help search engine's index. This option is
+               useful in case the associated index files get corrupted.
+               \QA will re-index the documentation at the next start-up.
+        \row
+            \o -setCurrentFilter <filter>
             \o Sets the given filter as the active filter.
         \row
             \o -quiet
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 62afd7306a..75bddd6338 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -195,7 +195,6 @@ InputTest::InputTest()
 
     pullMode = true;
 
-    // AudioInfo class only supports mono S16LE samples!
     format.setFrequency(8000);
     format.setChannels(1);
     format.setSampleSize(16);
@@ -203,6 +202,17 @@ InputTest::InputTest()
     format.setByteOrder(QAudioFormat::LittleEndian);
     format.setCodec("audio/pcm");
 
+    QAudioDeviceInfo info(QAudioDeviceInfo::defaultInputDevice());
+    if (!info.isFormatSupported(format)) {
+        qWarning()<<"default format not supported try to use nearest";
+        format = info.nearestFormat(format);
+    }
+
+    if(format.sampleSize() != 16) {
+        qWarning()<<"audio device doesn't support 16 bit samples, example cannot run";
+        return;
+    }
+
     audioInput = new QAudioInput(format,this);
     connect(audioInput,SIGNAL(notify()),SLOT(status()));
     connect(audioInput,SIGNAL(stateChanged(QAudio::State)),SLOT(state(QAudio::State)));
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 244840d06f..b6047db2b9 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -170,6 +170,18 @@ AudioTest::AudioTest()
     settings.setCodec("audio/pcm");
     settings.setByteOrder(QAudioFormat::LittleEndian);
     settings.setSampleType(QAudioFormat::SignedInt);
+
+    QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
+    if (!info.isFormatSupported(settings)) {
+        qWarning()<<"default format not supported try to use nearest";
+        settings = info.nearestFormat(settings);
+    }
+
+    if(settings.sampleSize() != 16) {
+        qWarning()<<"audio device doesn't support 16 bit samples, example cannot run";
+        return;
+    }
+
     audioOutput = new QAudioOutput(settings,this);
     connect(audioOutput,SIGNAL(notify()),SLOT(status()));
     connect(audioOutput,SIGNAL(stateChanged(QAudio::State)),SLOT(state(QAudio::State)));
diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index 0c95baf009..c6758286f8 100644
--- a/mkspecs/features/unix/separate_debug_info.prf
+++ b/mkspecs/features/unix/separate_debug_info.prf
@@ -1,5 +1,5 @@
 
-!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
+!separate_debug_info_nocopy:!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
     QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ;
     QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
 
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 237477c898..8a480c45df 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -134,5 +134,5 @@ QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 
-include(../common/unix.conf)
+include(../../common/unix.conf)
 load(qt_config)
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 6225720f56..f2baf46a88 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -88,15 +88,15 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         t << "# ==============================================================================" << "\n" << endl;
 
         t << endl << endl;
-        
+
         t << "MAKE = make" << endl;
         t << endl;
-        
+
         t << "VISUAL_CFG = RELEASE" << endl;
-        t << "ifeq \"$(CFG)\" \"UDEB\"" << endl;        
-        t << "VISUAL_CFG = DEBUG" << endl;        
-        t << "endif" << endl;           
-        t << endl;        
+        t << "ifeq \"$(CFG)\" \"UDEB\"" << endl;
+        t << "VISUAL_CFG = DEBUG" << endl;
+        t << "endif" << endl;
+        t << endl;
 
         t << DO_NOTHING_TARGET " :" << endl;
         t << "\t" << "@rem " DO_NOTHING_TARGET << endl << endl;
@@ -113,8 +113,8 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
             cleanDepsWinscw.append(WINSCW_DEPLOYMENT_CLEAN_TARGET);
             finalDeps.append(DO_NOTHING_TARGET);
             finalDepsWinscw.append(WINSCW_DEPLOYMENT_TARGET);
-            wrapperTargets << WINSCW_DEPLOYMENT_TARGET 
-                << WINSCW_DEPLOYMENT_CLEAN_TARGET 
+            wrapperTargets << WINSCW_DEPLOYMENT_TARGET
+                << WINSCW_DEPLOYMENT_CLEAN_TARGET
                 << STORE_BUILD_TARGET;
         } else {
             buildDeps.append(CREATE_TEMPS_TARGET " " PRE_TARGETDEPS_TARGET " " STORE_BUILD_TARGET);
@@ -153,9 +153,9 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath()));
         foreach(QString target, wrapperTargets) {
             t << target << " : " << makefile << endl;
-            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SIS_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;                    
-        }     
-        
+            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SIS_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;
+        }
+
         t << endl;
     } // if(ft.open(QIODevice::WriteOnly))
 }
@@ -375,7 +375,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
     // Create execution target
     if (debugPlatforms.contains("winscw") && targetType == TypeExe) {
         t << "run:" << endl;
-        t << "\t-call " << epocRoot() << "epoc32\\release\\winscw\\udeb\\" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << endl << endl;
+        t << "\t-call " << epocRoot() << "epoc32\\release\\winscw\\udeb\\" << fixedTarget << ".exe" << endl << endl;
     }
 }
 
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index c7eae646bc..ad22cfd222 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -234,7 +234,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
     // create execution target
     if (debugPlatforms.contains("winscw") && targetType == TypeExe) {
         t << "run:" << endl;
-        t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << endl << endl;
+        t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe" << endl << endl;
     }
 }
 
diff --git a/src/3rdparty/easing/easing.cpp b/src/3rdparty/easing/easing.cpp
index 81af40f29d..7d70a4d24b 100644
--- a/src/3rdparty/easing/easing.cpp
+++ b/src/3rdparty/easing/easing.cpp
@@ -252,7 +252,7 @@ static qreal easeOutInQuint(qreal t)
  */
 static qreal easeInSine(qreal t)
 {
-    return (t == 1.0) ? 1.0 : -::cos(t * M_PI_2) + 1.0;
+    return (t == 1.0) ? 1.0 : -::qCos(t * M_PI_2) + 1.0;
 }
 
 /**
@@ -263,7 +263,7 @@ static qreal easeInSine(qreal t)
  */
 static qreal easeOutSine(qreal t)
 {
-    return ::sin(t* M_PI_2);
+    return ::qSin(t* M_PI_2);
 }
 
 /**
@@ -274,7 +274,7 @@ static qreal easeOutSine(qreal t)
  */
 static qreal easeInOutSine(qreal t)
 {
-    return -0.5 * (::cos(M_PI*t) - 1);
+    return -0.5 * (::qCos(M_PI*t) - 1);
 }
 
 /**
@@ -397,15 +397,15 @@ static qreal easeInElastic_helper(qreal t, qreal b, qreal c, qreal d, qreal a, q
     if (t_adj==1) return b+c;
 
     qreal s;
-    if(a < ::fabs(c)) {
+    if(a < ::qFabs(c)) {
         a = c;
         s = p / 4.0f;
     } else {
-        s = p / (2 * M_PI) * ::asin(c / a);
+        s = p / (2 * M_PI) * ::qAsin(c / a);
     }
 
     t_adj -= 1.0f;
-    return -(a*::qPow(2.0f,10*t_adj) * ::sin( (t_adj*d-s)*(2*M_PI)/p )) + b;
+    return -(a*::qPow(2.0f,10*t_adj) * ::qSin( (t_adj*d-s)*(2*M_PI)/p )) + b;
 }
 
 /**
@@ -431,10 +431,10 @@ static qreal easeOutElastic_helper(qreal t, qreal /*b*/, qreal c, qreal /*d*/, q
         a = c;
         s = p / 4.0f;
     } else {
-        s = p / (2 * M_PI) * ::asin(c / a);
+        s = p / (2 * M_PI) * ::qAsin(c / a);
     }
 
-    return (a*::qPow(2.0f,-10*t) * ::sin( (t-s)*(2*M_PI)/p ) + c);
+    return (a*::qPow(2.0f,-10*t) * ::qSin( (t-s)*(2*M_PI)/p ) + c);
 }
 
 /**
@@ -469,11 +469,11 @@ static qreal easeInOutElastic(qreal t, qreal a, qreal p)
         a = 1.0;
         s = p / 4.0f;
     } else {
-        s = p / (2 * M_PI) * ::asin(1.0 / a);
+        s = p / (2 * M_PI) * ::qAsin(1.0 / a);
     }
 
-    if (t < 1) return -.5*(a*::qPow(2.0f,10*(t-1)) * ::sin( (t-1-s)*(2*M_PI)/p ));
-    return a*::qPow(2.0f,-10*(t-1)) * ::sin( (t-1-s)*(2*M_PI)/p )*.5 + 1.0;
+    if (t < 1) return -.5*(a*::qPow(2.0f,10*(t-1)) * ::qSin( (t-1-s)*(2*M_PI)/p ));
+    return a*::qPow(2.0f,-10*(t-1)) * ::qSin( (t-1-s)*(2*M_PI)/p )*.5 + 1.0;
 }
 
 /**
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index d529f670fa..bc0d35ec71 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -373,6 +373,13 @@ QVariantAnimation::~QVariantAnimation()
     Another example is QEasingCurve::InOutElastic, which provides an
     elastic effect on the values of the interpolated variant.
 
+    QVariantAnimation will use the QEasingCurve::valueForProgress() to
+    transform the "normalized progress" (currentTime / totalDuration)
+    of the animation into the effective progress actually
+    used by the animation. It is this effective progress that will be
+    the progress when interpolated() is called. Also, the steps in the
+    keyValues are referring to this effective progress.
+
     The easing curve is used with the interpolator, the interpolated()
     virtual function, the animation's duration, and iterationCount, to
     control how the current value changes as the animation progresses.
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 62b5409eef..0c94482dd8 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -77,6 +77,7 @@
 #include <e32def.h>
 #include <e32debug.h>
 #include <f32file.h>
+#include <e32math.h>
 # include "private/qcore_symbian_p.h"
 
 _LIT(qt_S60Filter, "Series60v?.*.sis");
@@ -2493,7 +2494,7 @@ bool qputenv(const char *varName, const QByteArray& value)
 #endif
 }
 
-#if (defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD)
 
 #  if defined(Q_OS_INTEGRITY) && defined(__GHS_VERSION_NUMBER) && (__GHS_VERSION_NUMBER < 500)
 // older versions of INTEGRITY used a long instead of a uint for the seed.
@@ -2516,8 +2517,6 @@ Q_GLOBAL_STATIC(SeedStorage, randTLS)  // Thread Local Storage for seed value
     Sets the argument \a seed to be used to generate a new random number sequence of
     pseudo random integers to be returned by qrand().
 
-    If no seed value is provided, qrand() is automatically seeded with a value of 1.
-
     The sequence of random numbers generated is deterministic per thread. For example,
     if two threads call qsrand(1) and subsequently calls qrand(), the threads will get
     the same random number sequence.
@@ -2541,8 +2540,9 @@ void qsrand(uint seed)
         srand(seed);
     }
 #else
-    // On Windows srand() and rand() already use Thread-Local-Storage
+    // On Windows and Symbian srand() and rand() already use Thread-Local-Storage
     // to store the seed between calls
+    // this is also valid for QT_NO_THREAD
     srand(seed);
 #endif
 }
@@ -2558,7 +2558,7 @@ void qsrand(uint seed)
 */
 void qsrand()
 {
-#if (defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD)
     SeedStorage *seedStorage = randTLS();
     if (seedStorage) {
         SeedStorageType *pseed = seedStorage->localData();
@@ -2572,24 +2572,28 @@ void qsrand()
         *pseed = QDateTime::currentDateTime().toTime_t()
                  + quintptr(&pseed)
                  + serial.fetchAndAddRelaxed(1);
-#if defined(Q_OS_WIN)
-        // for Windows the srand function must still be called.
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+        // for Windows and Symbian the srand function must still be called.
         srand(*pseed);
 #endif
     }
 
-#elif defined(Q_OS_WIN)
+//QT_NO_THREAD implementations
+#else
     static unsigned int seed = 0;
 
     if (seed)
         return;
 
+#if defined(Q_OS_SYMBIAN)
+    seed = Math::Random();
+#elif defined(Q_OS_WIN)
     seed = GetTickCount();
-    srand(seed);
 #else
-    // Symbian?
-
-#endif // defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
+    seed = quintptr(&seed) + QDateTime::currentDateTime().toTime_t();
+#endif
+    srand(seed);
+#endif // defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD)
 }
 
 /*!
@@ -2626,8 +2630,9 @@ int qrand()
         return rand();
     }
 #else
-    // On Windows srand() and rand() already use Thread-Local-Storage
+    // On Windows and Symbian srand() and rand() already use Thread-Local-Storage
     // to store the seed between calls
+    // this is also valid for QT_NO_THREAD
     return rand();
 #endif
 }
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 5c543d4343..a061ad1703 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -273,7 +273,7 @@ QResourcePrivate::load(const QString &file)
     QString cleaned = cleanPath(file);
     for(int i = 0; i < list->size(); ++i) {
         QResourceRoot *res = list->at(i);
-        const int node = res->findNode(cleaned);
+        const int node = res->findNode(cleaned, locale);
         if(node != -1) {
             if(related.isEmpty()) {
                 container = res->isContainer(node);
diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h
index 820f4244b3..16e6bb7c40 100644
--- a/src/corelib/kernel/qmath.h
+++ b/src/corelib/kernel/qmath.h
@@ -46,6 +46,10 @@
 
 #include <QtCore/qglobal.h>
 
+#ifdef Q_OS_SYMBIAN
+#    include <e32math.h>
+#endif
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -88,82 +92,130 @@ inline qreal qFabs(qreal v)
 
 inline qreal qSin(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return sinf(float(v));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal sin_v;
+    Math::Sin(sin_v, static_cast<TReal>(v));
+    return static_cast<qreal>(sin_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if (sizeof(qreal) == sizeof(float))
+            return sinf(float(v));
+        else
+#    endif
+            return sin(v);
 #endif
-        return sin(v);
 }
 
 inline qreal qCos(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return cosf(float(v));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal cos_v;
+    Math::Cos(cos_v, static_cast<TReal>(v));
+    return static_cast<qreal>(cos_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if (sizeof(qreal) == sizeof(float))
+            return cosf(float(v));
+        else
+#    endif
+            return cos(v);
 #endif
-        return cos(v);
 }
 
 inline qreal qTan(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return tanf(float(v));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal tan_v;
+    Math::Tan(tan_v, static_cast<TReal>(v));
+    return static_cast<qreal>(tan_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if (sizeof(qreal) == sizeof(float))
+            return tanf(float(v));
+        else
+#    endif
+            return tan(v);
 #endif
-        return tan(v);
 }
 
 inline qreal qAcos(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return acosf(float(v));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal acos_v;
+    Math::ACos(acos_v, static_cast<TReal>(v));
+    return static_cast<qreal>(acos_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if (sizeof(qreal) == sizeof(float))
+            return acosf(float(v));
+        else
+#    endif
+           return acos(v);
 #endif
-        return acos(v);
 }
 
 inline qreal qAsin(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return asinf(float(v));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal asin_v;
+    Math::ASin(asin_v, static_cast<TReal>(v));
+    return static_cast<qreal>(asin_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if (sizeof(qreal) == sizeof(float))
+            return asinf(float(v));
+        else
+#    endif
+            return asin(v);
 #endif
-        return asin(v);
 }
 
 inline qreal qAtan(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if(sizeof(qreal) == sizeof(float))
-        return atanf(float(v));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal atan_v;
+    Math::ATan(atan_v, static_cast<TReal>(v));
+    return static_cast<qreal>(atan_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if(sizeof(qreal) == sizeof(float))
+            return atanf(float(v));
+        else
+#    endif
+            return atan(v);
 #endif
-        return atan(v);
 }
 
 inline qreal qAtan2(qreal x, qreal y)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if(sizeof(qreal) == sizeof(float))
-        return atan2f(float(x), float(y));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal atan2_v;
+    Math::ATan(atan2_v, static_cast<TReal>(x), static_cast<TReal>(y));
+    return static_cast<qreal>(atan2_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if(sizeof(qreal) == sizeof(float))
+            return atan2f(float(x), float(y));
+        else
+#    endif
+            return atan2(x, y);
 #endif
-        return atan2(x, y);
 }
 
 inline qreal qSqrt(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return sqrtf(float(v));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal sqrt_v;
+    Math::Sqrt(sqrt_v, static_cast<TReal>(v));
+    return static_cast<qreal>(sqrt_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if (sizeof(qreal) == sizeof(float))
+            return sqrtf(float(v));
+        else
+#    endif
+            return sqrt(v);
 #endif
-        return sqrt(v);
 }
 
 inline qreal qLn(qreal v)
@@ -178,19 +230,31 @@ inline qreal qLn(qreal v)
 
 inline qreal qExp(qreal v)
 {
+#ifdef Q_OS_SYMBIAN
+    TReal exp_v;
+    Math::Exp(exp_v, static_cast<TReal>(v));
+    return static_cast<qreal>(exp_v);
+#else
     // only one signature
     // exists, exp(double)
     return exp(v);
+#endif
 }
 
 inline qreal qPow(qreal x, qreal y)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return powf(float(x), float(y));
-    else
+#ifdef Q_OS_SYMBIAN
+    TReal pow_v;
+    Math::Pow(pow_v, static_cast<TReal>(x), static_cast<TReal>(y));
+    return static_cast<qreal>(pow_v);
+#else
+#    ifdef QT_USE_MATH_H_FLOATS
+        if (sizeof(qreal) == sizeof(float))
+            return powf(float(x), float(y));
+        else
+#    endif
+            return pow(x, y);
 #endif
-        return pow(x, y);
 }
 
 #ifndef M_PI
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 6e6da191d6..72d6786772 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -2648,6 +2648,7 @@ const char* QMetaClassInfo::value() const
  */
 int QMetaObjectPrivate::originalClone(const QMetaObject *mobj, int local_method_index)
 {
+    Q_ASSERT(local_method_index < get(mobj)->methodCount);
     int handle = get(mobj)->methodData + 5 * local_method_index;
     while (mobj->d.data[handle + 4] & MethodCloned) {
         Q_ASSERT(local_method_index > 0);
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 30cd011c59..4370ee032d 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -145,7 +145,7 @@ QObjectPrivate::QObjectPrivate(int version)
     receiveChildEvents = true;
     postedEvents = 0;
     extraData = 0;
-    connectedSignals = 0;
+    connectedSignals[0] = connectedSignals[1] = 0;
     inEventHandler = false;
     inThreadChangeEvent = false;
     deleteWatch = 0;
@@ -2850,6 +2850,27 @@ void QObject::disconnectNotify(const char *)
 {
 }
 
+/* \internal
+    convert a signal index from the method range to the signal range
+ */
+static int methodIndexToSignalIndex(const QMetaObject *metaObject, int signal_index)
+{
+    if (signal_index < 0)
+        return signal_index;
+    while (metaObject && metaObject->methodOffset() > signal_index)
+        metaObject = metaObject->superClass();
+
+    if (metaObject) {
+        int signalOffset, methodOffset;
+        computeOffsets(metaObject, &signalOffset, &methodOffset);
+        if (signal_index < metaObject->methodCount())
+            signal_index = QMetaObjectPrivate::originalClone(metaObject, signal_index - methodOffset) + signalOffset;
+        else
+            signal_index = signal_index - methodOffset + signalOffset;
+    }
+    return signal_index;
+}
+
 /*!\internal
    \a types is a 0-terminated vector of meta types for queued
    connections.
@@ -2860,16 +2881,7 @@ void QObject::disconnectNotify(const char *)
 bool QMetaObject::connect(const QObject *sender, int signal_index,
                           const QObject *receiver, int method_index, int type, int *types)
 {
-    if (signal_index > 0) {
-        const QMetaObject *mo = sender->metaObject();
-        while (mo && mo->methodOffset() > signal_index)
-            mo = mo->superClass();
-        if (mo) {
-            int signalOffset, methodOffset;
-            computeOffsets(mo, &signalOffset, &methodOffset);
-            signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset;
-        }
-    }
+    signal_index = methodIndexToSignalIndex(sender->metaObject(), signal_index);
     return QMetaObjectPrivate::connect(sender, signal_index,
                                        receiver, method_index, type, types);
 }
@@ -2924,9 +2936,9 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,
 
     QObjectPrivate *const sender_d = QObjectPrivate::get(s);
     if (signal_index < 0) {
-        sender_d->connectedSignals = ~ulong(0);
+        sender_d->connectedSignals[0] = sender_d->connectedSignals[1] = ~0;
     } else if (signal_index < (int)sizeof(sender_d->connectedSignals) * 8) {
-        sender_d->connectedSignals |= ulong(1) << signal_index;
+        sender_d->connectedSignals[signal_index >> 5] |= (1 << (signal_index & 0x1f));
     }
 
     return true;
@@ -2938,16 +2950,7 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,
 bool QMetaObject::disconnect(const QObject *sender, int signal_index,
                              const QObject *receiver, int method_index)
 {
-    if (signal_index > 0) {
-        const QMetaObject *mo = sender->metaObject();
-        while (mo && mo->methodOffset() > signal_index)
-            mo = mo->superClass();
-        if (mo) {
-            int signalOffset, methodOffset;
-            computeOffsets(mo, &signalOffset, &methodOffset);
-            signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset;
-        }
-    }
+    signal_index = methodIndexToSignalIndex(sender->metaObject(), signal_index);
     return QMetaObjectPrivate::disconnect(sender, signal_index,
                                           receiver, method_index);
 }
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index f899c78f30..d1841be68e 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -172,7 +172,7 @@ public:
     }
 
     int signalIndex(const char *signalName) const;
-    inline bool isSignalConnected(int signalIdx) const;
+    inline bool isSignalConnected(uint signalIdx) const;
 
 public:
     QString objectName;
@@ -183,7 +183,7 @@ public:
 
     Connection *senders;     // linked list of connections connected to this object
     Sender *currentSender;   // object currently activating the object
-    mutable ulong connectedSignals;
+    mutable quint32 connectedSignals[2];
 
 #ifdef QT3_SUPPORT
     QList<QObject *> pendingChildInsertedEvents;
@@ -205,6 +205,7 @@ public:
     int *deleteWatch;
 };
 
+
 /*! \internal
 
   Returns true if the signal with index \a signal_index from object \a sender is connected.
@@ -213,12 +214,12 @@ public:
 
   \a signal_index must be the index returned by QObjectPrivate::signalIndex;
 */
-inline bool QObjectPrivate::isSignalConnected(int signal_index) const
+inline bool QObjectPrivate::isSignalConnected(uint signal_index) const
 {
-    return signal_index >= (int)sizeof(connectedSignals) * 8
+    return signal_index >= sizeof(connectedSignals) * 8
         || qt_signal_spy_callback_set.signal_begin_callback
         || qt_signal_spy_callback_set.signal_end_callback
-        || (connectedSignals & (ulong(1) << signal_index));
+        || (connectedSignals[signal_index >> 5] & (1 << (signal_index & 0x1f)));
 }
 
 
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 3c107882ca..74ff17f54f 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -458,7 +458,7 @@ inline void qVariantSetValue(QVariant &v, const T &t)
     //if possible we reuse the current QVariant private
     const uint type = qMetaTypeId<T>(reinterpret_cast<T *>(0));
     QVariant::Private &d = v.data_ptr();
-    if (v.isDetached() && (type <= uint(QVariant::Char) || type == d.type)) {
+    if (v.isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) {
         d.type = type;
         d.is_null = false;
         T *old = reinterpret_cast<T*>(d.is_shared ? d.data.shared->ptr : &d.data.ptr);
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index 46e20b16c9..66f9f73e95 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -70,8 +70,9 @@ class QCache
         if (l == &n) l = n.p;
         if (f == &n) f = n.n;
         total -= n.c;
-        delete n.t;
+        T *obj = n.t;
         hash.remove(*n.keyPtr);
+        delete obj;
     }
     inline T *relink(const Key &key) {
         typename QHash<Key, Node>::iterator i = hash.find(key);
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index d0afb7ab9a..8112757bf0 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -574,7 +574,7 @@ qreal QLineF::angle() const
     const qreal dx = pt2.x() - pt1.x();
     const qreal dy = pt2.y() - pt1.y();
 
-    const qreal theta = atan2(-dy, dx) * 360.0 / M_2PI;
+    const qreal theta = qAtan2(-dy, dx) * 360.0 / M_2PI;
 
     const qreal theta_normalized = theta < 0 ? theta + 360 : theta;
 
@@ -814,7 +814,7 @@ qreal QLineF::angle(const QLineF &l) const
     qreal cos_line = (dx()*l.dx() + dy()*l.dy()) / (length()*l.length());
     qreal rad = 0;
     // only accept cos_line in the range [-1,1], if it is outside, use 0 (we return 0 rather than PI for those cases)
-    if (cos_line >= -1.0 && cos_line <= 1.0) rad = acos( cos_line );
+    if (cos_line >= -1.0 && cos_line <= 1.0) rad = qAcos( cos_line );
     return rad * 360 / M_2PI;
 }
 
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h
index 2bad40e0a9..8a46b98ec3 100644
--- a/src/corelib/tools/qregexp.h
+++ b/src/corelib/tools/qregexp.h
@@ -119,7 +119,9 @@ public:
 #endif
     int matchedLength() const;
 #ifndef QT_NO_REGEXP_CAPTURE
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numCaptures() const;
+#endif
     int captureCount() const;
     QStringList capturedTexts() const;
     QStringList capturedTexts();
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index a318c43b73..8ec8d1c8f1 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -188,6 +188,9 @@ public:
     bool autoAddOkButton;
     QAbstractButton *detectedEscapeButton;
     QLabel *informativeLabel;
+#ifdef Q_OS_SYMBIAN
+    QTextEdit *textEdit;
+#endif
     QPointer<QObject> receiverToDisconnectOnClose;
     QByteArray memberToDisconnectOnClose;
     QByteArray signalToDisconnectOnClose;
@@ -2459,10 +2462,24 @@ void QMessageBox::setInformativeText(const QString &text)
 #endif
         label->setWordWrap(true);
         QGridLayout *grid = static_cast<QGridLayout *>(layout());
+#ifdef Q_OS_SYMBIAN
+        label->hide();
+        QTextEdit *textEdit = new QTextEdit(this);
+        textEdit->setReadOnly(true);
+        grid->addWidget(textEdit, 1, 1, 1, 1);
+        d->textEdit = textEdit;
+#else
         grid->addWidget(label, 1, 1, 1, 1);
+#endif
         d->informativeLabel = label;
     }
     d->informativeLabel->setText(text);
+
+#ifdef Q_OS_SYMBIAN
+    //We need to put the informative label inside textEdit to enable scrolling of long texts.
+    d->textEdit->setText(d->informativeLabel->text());
+#endif
+
     d->updateSize();
 }
 
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp
index 239e29cd7f..a523bab6b7 100644
--- a/src/gui/effects/qgraphicseffect.cpp
+++ b/src/gui/effects/qgraphicseffect.cpp
@@ -160,6 +160,10 @@ QRectF QGraphicsEffectSource::boundingRect(Qt::CoordinateSystem system) const
 /*!
     Returns the bounding rectangle of the source mapped to the given \a system.
 
+    Calling this function with Qt::DeviceCoordinates outside of
+    QGraphicsEffect::draw() will give undefined results, as there is no device
+    context available.
+
     \sa draw()
 */
 QRectF QGraphicsEffect::sourceBoundingRect(Qt::CoordinateSystem system) const
@@ -309,7 +313,10 @@ QPixmap QGraphicsEffectSource::pixmap(Qt::CoordinateSystem system, QPoint *offse
     // Shortcut, no cache for childless pixmap items...
     const QGraphicsItem *item = graphicsItem();
     if (system == Qt::LogicalCoordinates && mode == QGraphicsEffect::NoPad && item && isPixmap()) {
-        return ((QGraphicsPixmapItem *) item)->pixmap();
+        const QGraphicsPixmapItem *pixmapItem = static_cast<const QGraphicsPixmapItem *>(item);
+        if (offset)
+            *offset = pixmapItem->offset().toPoint();
+        return pixmapItem->pixmap();
     }
 
     if (system == Qt::DeviceCoordinates && item
@@ -348,6 +355,10 @@ QPixmap QGraphicsEffectSource::pixmap(Qt::CoordinateSystem system, QPoint *offse
     The returned pixmap is clipped to the current painter's device rectangle when
     \a system is Qt::DeviceCoordinates.
 
+    Calling this function with Qt::DeviceCoordinates outside of
+    QGraphicsEffect::draw() will give undefined results, as there is no device
+    context available.
+
     \sa draw(), boundingRect()
 */
 QPixmap QGraphicsEffect::sourcePixmap(Qt::CoordinateSystem system, QPoint *offset, QGraphicsEffect::PixmapPadMode mode) const
@@ -363,10 +374,14 @@ QGraphicsEffectSourcePrivate::~QGraphicsEffectSourcePrivate()
     invalidateCache();
 }
 
-void QGraphicsEffectSourcePrivate::invalidateCache(bool effectRectChanged) const
+void QGraphicsEffectSourcePrivate::invalidateCache(InvalidateReason reason) const
 {
-    if (effectRectChanged && m_cachedMode != QGraphicsEffect::PadToEffectiveBoundingRect)
+    if (m_cachedMode != QGraphicsEffect::PadToEffectiveBoundingRect
+        && (reason == EffectRectChanged
+            || reason == TransformChanged
+               && m_cachedSystem == Qt::LogicalCoordinates))
         return;
+
     QPixmapCache::remove(m_cacheKey);
 }
 
@@ -398,8 +413,8 @@ QGraphicsEffect::~QGraphicsEffect()
 
 /*!
     Returns the effective bounding rectangle for this effect, i.e., the
-    bounding rectangle of the source, adjusted by any margins applied by
-    the effect itself.
+    bounding rectangle of the source in device coordinates, adjusted by
+    any margins applied by the effect itself.
 
     \sa boundingRectFor(), updateBoundingRect()
 */
@@ -413,7 +428,7 @@ QRectF QGraphicsEffect::boundingRect() const
 
 /*!
     Returns the effective bounding rectangle for this effect, given the
-    provided \a rect in the source's coordinate space. When writing
+    provided \a rect in the device coordinates. When writing
     you own custom effect, you must call updateBoundingRect() whenever any
     parameters are changed that may cause this this function to return a
     different value.
@@ -512,7 +527,7 @@ void QGraphicsEffect::updateBoundingRect()
     Q_D(QGraphicsEffect);
     if (d->source) {
         d->source->d_func()->effectBoundingRectChanged();
-        d->source->d_func()->invalidateCache(true);
+        d->source->d_func()->invalidateCache(QGraphicsEffectSourcePrivate::EffectRectChanged);
     }
 }
 
@@ -829,22 +844,19 @@ QRectF QGraphicsBlurEffect::boundingRectFor(const QRectF &rect) const
 void QGraphicsBlurEffect::draw(QPainter *painter)
 {
     Q_D(QGraphicsBlurEffect);
-    if (d->filter->radius() <= 0) {
+    if (d->filter->radius() < 1) {
         drawSource(painter);
         return;
     }
 
     PixmapPadMode mode = PadToEffectiveBoundingRect;
     if (painter->paintEngine()->type() == QPaintEngine::OpenGL2)
-        mode = PadToTransparentBorder;
+        mode = NoPad;
 
     // Draw pixmap in device coordinates to avoid pixmap scaling.
     QPoint offset;
-    const QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset, mode);
-    QTransform restoreTransform = painter->worldTransform();
-    painter->setWorldTransform(QTransform());
+    QPixmap pixmap = sourcePixmap(Qt::LogicalCoordinates, &offset, mode);
     d->filter->draw(painter, offset, pixmap);
-    painter->setWorldTransform(restoreTransform);
 }
 
 /*!
@@ -1025,7 +1037,7 @@ void QGraphicsDropShadowEffect::draw(QPainter *painter)
 
     PixmapPadMode mode = PadToEffectiveBoundingRect;
     if (painter->paintEngine()->type() == QPaintEngine::OpenGL2)
-        mode = PadToTransparentBorder;
+        mode = NoPad;
 
     // Draw pixmap in device coordinates to avoid pixmap scaling.
     QPoint offset;
diff --git a/src/gui/effects/qgraphicseffect_p.h b/src/gui/effects/qgraphicseffect_p.h
index 0011eef5e3..cab7a48521 100644
--- a/src/gui/effects/qgraphicseffect_p.h
+++ b/src/gui/effects/qgraphicseffect_p.h
@@ -108,6 +108,13 @@ public:
         , m_cachedMode(QGraphicsEffect::PadToTransparentBorder)
     {}
 
+    enum InvalidateReason
+    {
+        TransformChanged,
+        EffectRectChanged,
+        SourceChanged
+    };
+
     virtual ~QGraphicsEffectSourcePrivate();
     virtual void detach() = 0;
     virtual QRectF boundingRect(Qt::CoordinateSystem system) const = 0;
@@ -121,7 +128,9 @@ public:
     virtual QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset = 0,
                            QGraphicsEffect::PixmapPadMode mode = QGraphicsEffect::PadToTransparentBorder) const = 0;
     virtual void effectBoundingRectChanged() = 0;
-    void invalidateCache(bool effectRectChanged = false) const;
+
+    void invalidateCache(InvalidateReason reason = SourceChanged) const;
+    Qt::CoordinateSystem currentCachedSystem() const { return m_cachedSystem; }
 
     friend class QGraphicsScenePrivate;
     friend class QGraphicsItem;
diff --git a/src/gui/embedded/qscreen_qws.h b/src/gui/embedded/qscreen_qws.h
index b3246f9edc..7ab49fbece 100644
--- a/src/gui/embedded/qscreen_qws.h
+++ b/src/gui/embedded/qscreen_qws.h
@@ -243,7 +243,9 @@ public:
     int totalSize() const { return mapsize; }
 
     QRgb * clut() { return screenclut; }
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numCols() { return screencols; }
+#endif
     int colorCount() { return screencols; }
 
     virtual QSize mapToDevice(const QSize &) const;
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
index 6718a280ec..f504c54609 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
@@ -321,14 +321,14 @@ void QGraphicsAnchorLayout::addCornerAnchors(QGraphicsLayoutItem *firstItem,
     // Horizontal anchor
     Qt::AnchorPoint firstEdge = (firstCorner & 1 ? Qt::AnchorRight: Qt::AnchorLeft);
     Qt::AnchorPoint secondEdge = (secondCorner & 1 ? Qt::AnchorRight: Qt::AnchorLeft);
-    d->addAnchor(firstItem, firstEdge, secondItem, secondEdge);
+    if (d->addAnchor(firstItem, firstEdge, secondItem, secondEdge)) {
+        // Vertical anchor
+        firstEdge = (firstCorner & 2 ? Qt::AnchorBottom: Qt::AnchorTop);
+        secondEdge = (secondCorner & 2 ? Qt::AnchorBottom: Qt::AnchorTop);
+        d->addAnchor(firstItem, firstEdge, secondItem, secondEdge);
 
-    // Vertical anchor
-    firstEdge = (firstCorner & 2 ? Qt::AnchorBottom: Qt::AnchorTop);
-    secondEdge = (secondCorner & 2 ? Qt::AnchorBottom: Qt::AnchorTop);
-    d->addAnchor(firstItem, firstEdge, secondItem, secondEdge);
-
-    invalidate();
+        invalidate();
+    }
 }
 
 /*!
@@ -351,11 +351,14 @@ void QGraphicsAnchorLayout::addAnchors(QGraphicsLayoutItem *firstItem,
                                        QGraphicsLayoutItem *secondItem,
                                        Qt::Orientations orientations)
 {
+    bool ok = true;
     if (orientations & Qt::Horizontal) {
-        addAnchor(secondItem, Qt::AnchorLeft, firstItem, Qt::AnchorLeft);
-        addAnchor(firstItem, Qt::AnchorRight, secondItem, Qt::AnchorRight);
+        // Currently, if the first is ok, then the rest of the calls should be ok
+        ok = addAnchor(secondItem, Qt::AnchorLeft, firstItem, Qt::AnchorLeft) != 0;
+        if (ok)
+            addAnchor(firstItem, Qt::AnchorRight, secondItem, Qt::AnchorRight);
     }
-    if (orientations & Qt::Vertical) {
+    if (orientations & Qt::Vertical && ok) {
         addAnchor(secondItem, Qt::AnchorTop, firstItem, Qt::AnchorTop);
         addAnchor(firstItem, Qt::AnchorBottom, secondItem, Qt::AnchorBottom);
     }
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 03ed63dcf9..1dc6873144 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -1666,6 +1666,13 @@ QGraphicsAnchor *QGraphicsAnchorLayoutPrivate::addAnchor(QGraphicsLayoutItem *fi
         return 0;
     }
 
+    const QGraphicsLayoutItem *parentWidget = q->parentLayoutItem();
+    if (firstItem == parentWidget || secondItem == parentWidget) {
+        qWarning("QGraphicsAnchorLayout::addAnchor(): "
+                 "You cannot add the parent of the layout to the layout.");
+        return 0;
+    }
+
     // In QGraphicsAnchorLayout, items are represented in its internal
     // graph as four anchors that connect:
     //  - Left -> HCenter
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 90cc132104..fbfd8e6c10 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -2584,6 +2584,35 @@ void QGraphicsItem::setGraphicsEffect(QGraphicsEffect *effect)
 /*!
     \internal
     \since 4.6
+    Returns the effective bounding rect of the given item space rect.
+    If the item has no effect, the rect is returned unmodified.
+    If the item has an effect, the effective rect can be extend beyond the
+    item's bounding rect, depending on the effect.
+
+    \sa boundingRect()
+*/
+QRectF QGraphicsItemPrivate::effectiveBoundingRect(const QRectF &rect) const
+{
+#ifndef QT_NO_GRAPHICSEFFECT
+    Q_Q(const QGraphicsItem);
+    QGraphicsEffect *effect = graphicsEffect;
+    if (scene && effect && effect->isEnabled()) {
+        QRectF sceneRect = q->mapRectToScene(rect);
+        QRectF sceneEffectRect;
+        foreach (QGraphicsView *view, scene->views()) {
+            QRectF deviceRect = view->d_func()->mapRectFromScene(sceneRect);
+            QRect deviceEffectRect = effect->boundingRectFor(deviceRect).toAlignedRect();
+            sceneEffectRect |= view->d_func()->mapRectToScene(deviceEffectRect);
+        }
+        return q->mapRectFromScene(sceneEffectRect);
+    }
+#endif //QT_NO_GRAPHICSEFFECT
+    return rect;
+}
+
+/*!
+    \internal
+    \since 4.6
     Returns the effective bounding rect of the item.
     If the item has no effect, this is the same as the item's bounding rect.
     If the item has an effect, the effective rect can be larger than the item's
@@ -2594,16 +2623,19 @@ void QGraphicsItem::setGraphicsEffect(QGraphicsEffect *effect)
 QRectF QGraphicsItemPrivate::effectiveBoundingRect() const
 {
 #ifndef QT_NO_GRAPHICSEFFECT
-    QGraphicsEffect *effect = graphicsEffect;
-    QRectF brect = effect && effect->isEnabled() ? effect->boundingRect() : q_ptr->boundingRect();
+    Q_Q(const QGraphicsItem);
+    QRectF brect = effectiveBoundingRect(q_ptr->boundingRect());
     if (ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)
         return brect;
 
     const QGraphicsItem *effectParent = parent;
     while (effectParent) {
-        effect = effectParent->d_ptr->graphicsEffect;
-        if (effect && effect->isEnabled())
-            brect = effect->boundingRectFor(brect);
+        QGraphicsEffect *effect = effectParent->d_ptr->graphicsEffect;
+        if (scene && effect && effect->isEnabled()) {
+            const QRectF brectInParentSpace = q->mapRectToItem(effectParent, brect);
+            const QRectF effectRectInParentSpace = effectParent->d_ptr->effectiveBoundingRect(brectInParentSpace);
+            brect = effectParent->mapRectToItem(q, effectRectInParentSpace);
+        }
         if (effectParent->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)
             return brect;
         effectParent = effectParent->d_ptr->parent;
@@ -7145,9 +7177,16 @@ void QGraphicsItem::prepareGeometryChange()
 
     QGraphicsItem *parent = this;
     while ((parent = parent->d_ptr->parent)) {
-        parent->d_ptr->dirtyChildrenBoundingRect = 1;
+        QGraphicsItemPrivate *parentp = parent->d_ptr.data();
+        parentp->dirtyChildrenBoundingRect = 1;
         // ### Only do this if the parent's effect applies to the entire subtree.
-        parent->d_ptr->notifyBoundingRectChanged = 1;
+        parentp->notifyBoundingRectChanged = 1;
+#ifndef QT_NO_GRAPHICSEFFECT
+        if (parentp->scene && parentp->graphicsEffect) {
+            parentp->notifyInvalidated = 1;
+            static_cast<QGraphicsItemEffectSourcePrivate *>(parentp->graphicsEffect->d_func()->source->d_func())->invalidateCache();
+        }
+#endif
     }
 }
 
@@ -10505,6 +10544,20 @@ void QGraphicsItemGroup::addToGroup(QGraphicsItem *item)
     if (!item->pos().isNull())
         newItemTransform *= QTransform::fromTranslate(-item->x(), -item->y());
 
+    // removing additional transformations properties applied with itemTransform()
+    QPointF origin = item->transformOriginPoint();
+    QMatrix4x4 m;
+    QList<QGraphicsTransform*> transformList = item->transformations();
+    for (int i = 0; i < transformList.size(); ++i)
+        transformList.at(i)->applyTo(&m);
+    newItemTransform *= m.toTransform().inverted();
+    newItemTransform.translate(origin.x(), origin.y());
+    newItemTransform.rotate(-item->rotation());
+    newItemTransform.scale(1/item->scale(), 1/item->scale());
+    newItemTransform.translate(-origin.x(), -origin.y());
+
+    // ### Expensive, we could maybe use dirtySceneTransform bit for optimization
+
     item->setTransform(newItemTransform);
     item->d_func()->setIsMemberOfGroup(true);
     prepareGeometryChange();
@@ -10529,11 +10582,39 @@ void QGraphicsItemGroup::removeFromGroup(QGraphicsItem *item)
     }
 
     QGraphicsItem *newParent = d_ptr->parent;
+
+    // COMBINE
+    bool ok;
+    QTransform itemTransform;
+    if (newParent)
+        itemTransform = item->itemTransform(newParent, &ok);
+    else
+        itemTransform = item->sceneTransform();
+
     QPointF oldPos = item->mapToItem(newParent, 0, 0);
     item->setParentItem(newParent);
-    // ### This function should remap the item's matrix to keep the item's
-    // transformation unchanged relative to the scene.
     item->setPos(oldPos);
+
+    // removing position from translation component of the new transform
+    if (!item->pos().isNull())
+        itemTransform *= QTransform::fromTranslate(-item->x(), -item->y());
+
+    // removing additional transformations properties applied
+    // with itemTransform() or sceneTransform()
+    QPointF origin = item->transformOriginPoint();
+    QMatrix4x4 m;
+    QList<QGraphicsTransform*> transformList = item->transformations();
+    for (int i = 0; i < transformList.size(); ++i)
+        transformList.at(i)->applyTo(&m);
+    itemTransform *= m.toTransform().inverted();
+    itemTransform.translate(origin.x(), origin.y());
+    itemTransform.rotate(-item->rotation());
+    itemTransform.scale(1 / item->scale(), 1 / item->scale());
+    itemTransform.translate(-origin.x(), -origin.y());
+
+    // ### Expensive, we could maybe use dirtySceneTransform bit for optimization
+
+    item->setTransform(itemTransform);
     item->d_func()->setIsMemberOfGroup(item->group() != 0);
 
     // ### Quite expensive. But removeFromGroup() isn't called very often.
@@ -10643,26 +10724,45 @@ QPixmap QGraphicsItemEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QP
         qWarning("QGraphicsEffectSource::pixmap: Not yet implemented, lacking device context");
         return QPixmap();
     }
-
     if (!item->d_ptr->scene)
         return QPixmap();
     QGraphicsScenePrivate *scened = item->d_ptr->scene->d_func();
 
     const QRectF sourceRect = boundingRect(system);
-    QRect effectRect;
+    QRectF effectRectF;
 
+    bool unpadded = false;
     if (mode == QGraphicsEffect::PadToEffectiveBoundingRect) {
-        effectRect = item->graphicsEffect()->boundingRectFor(sourceRect).toAlignedRect();
+        if (info) {
+            effectRectF = item->graphicsEffect()->boundingRectFor(boundingRect(Qt::DeviceCoordinates));
+            unpadded = (effectRectF.size() == sourceRect.size());
+            if (info && system == Qt::LogicalCoordinates)
+                effectRectF = info->painter->worldTransform().inverted().mapRect(effectRectF);
+        } else {
+            // no choice but to send a logical coordinate bounding rect to boundingRectFor
+            effectRectF = item->graphicsEffect()->boundingRectFor(sourceRect);
+        }
     } else if (mode == QGraphicsEffect::PadToTransparentBorder) {
         // adjust by 1.5 to account for cosmetic pens
-        effectRect = sourceRect.adjusted(-1.5, -1.5, 1.5, 1.5).toAlignedRect();
+        effectRectF = sourceRect.adjusted(-1.5, -1.5, 1.5, 1.5);
     } else {
-        effectRect = sourceRect.toAlignedRect();
+        effectRectF = sourceRect;
+        unpadded = true;
     }
 
+    QRect effectRect = effectRectF.toAlignedRect();
+
     if (offset)
         *offset = effectRect.topLeft();
 
+    bool untransformed = !deviceCoordinates
+            || info->painter->worldTransform().type() <= QTransform::TxTranslate;
+    if (untransformed && unpadded && isPixmap()) {
+        if (offset)
+            *offset = boundingRect(system).topLeft().toPoint();
+        return static_cast<QGraphicsPixmapItem *>(item)->pixmap();
+    }
+
     if (deviceCoordinates) {
         // Clip to viewport rect.
         int left, top, right, bottom;
@@ -10690,12 +10790,6 @@ QPixmap QGraphicsItemEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QP
     if (effectRect.isEmpty())
         return QPixmap();
 
-    if (system == Qt::LogicalCoordinates
-        && effectRect.size() == sourceRect.size()
-        && isPixmap()) {
-        return static_cast<QGraphicsPixmapItem *>(item)->pixmap();
-    }
-
     QPixmap pixmap(effectRect.size());
     pixmap.fill(Qt::transparent);
     QPainter pixmapPainter(&pixmap);
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 8f9fe54627..2d8de65be5 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -236,6 +236,8 @@ public:
     QRectF effectiveBoundingRect() const;
     QRectF sceneEffectiveBoundingRect() const;
 
+    QRectF effectiveBoundingRect(const QRectF &rect) const;
+
     virtual void resolveFont(uint inheritedMask)
     {
         for (int i = 0; i < children.size(); ++i)
diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp
index 2e9a30c68f..1e426c8920 100644
--- a/src/gui/graphicsview/qgraphicslayout.cpp
+++ b/src/gui/graphicsview/qgraphicslayout.cpp
@@ -148,6 +148,10 @@ QT_BEGIN_NAMESPACE
     
     \a parent is passed to QGraphicsLayoutItem's constructor and the
     QGraphicsLayoutItem's isLayout argument is set to \e true.
+
+    If \a parent is a QGraphicsWidget the layout will be installed
+    on that widget. (Note that installing a layout will delete the old one
+    installed.)
 */
 QGraphicsLayout::QGraphicsLayout(QGraphicsLayoutItem *parent)
     : QGraphicsLayoutItem(*new QGraphicsLayoutPrivate)
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 2a53456b23..182a3f519d 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -569,14 +569,10 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
 
     item->d_ptr->clearSubFocus();
 
-    if (!item->d_ptr->inDestructor && item == tabFocusFirst) {
-        QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
-        widget->d_func()->fixFocusChainBeforeReparenting(0, 0);
-    }
-
     if (item->flags() & QGraphicsItem::ItemSendsScenePositionChanges)
         unregisterScenePosItem(item);
 
+    QGraphicsScene *oldScene = item->d_func()->scene;
     item->d_func()->scene = 0;
 
     //We need to remove all children first because they might use their parent
@@ -587,6 +583,11 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
             q->removeItem(item->d_ptr->children.at(i));
     }
 
+    if (!item->d_ptr->inDestructor && item == tabFocusFirst) {
+        QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
+        widget->d_func()->fixFocusChainBeforeReparenting(0, oldScene, 0);
+    }
+
     // Unregister focus proxy.
     item->d_ptr->resetFocusProxy();
 
@@ -4670,10 +4671,13 @@ void QGraphicsScenePrivate::drawSubtreeRecursive(QGraphicsItem *item, QPainter *
             painter->setWorldTransform(*transformPtr);
         painter->setOpacity(opacity);
 
-        if (sourced->lastEffectTransform != painter->worldTransform()) {
+        if (sourced->currentCachedSystem() != Qt::LogicalCoordinates
+            && sourced->lastEffectTransform != painter->worldTransform())
+        {
             sourced->lastEffectTransform = painter->worldTransform();
-            sourced->invalidateCache();
+            sourced->invalidateCache(QGraphicsEffectSourcePrivate::TransformChanged);
         }
+
         item->d_ptr->graphicsEffect->draw(painter);
         painter->setWorldTransform(restoreTransform);
         sourced->info = 0;
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 3f9f4436fc..ffe64aa884 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -545,6 +545,32 @@ qint64 QGraphicsViewPrivate::verticalScroll() const
 
 /*!
     \internal
+
+    Maps the given rectangle to the scene using QTransform::mapRect()
+*/
+QRectF QGraphicsViewPrivate::mapRectToScene(const QRect &rect) const
+{
+    if (dirtyScroll)
+        const_cast<QGraphicsViewPrivate *>(this)->updateScroll();
+    QRectF scrolled = QRectF(rect.translated(scrollX, scrollY));
+    return identityMatrix ? scrolled : matrix.inverted().mapRect(scrolled);
+}
+
+
+/*!
+    \internal
+
+    Maps the given rectangle from the scene using QTransform::mapRect()
+*/
+QRectF QGraphicsViewPrivate::mapRectFromScene(const QRectF &rect) const
+{
+    if (dirtyScroll)
+        const_cast<QGraphicsViewPrivate *>(this)->updateScroll();
+    return (identityMatrix ? rect : matrix.mapRect(rect)).translated(-scrollX, -scrollY);
+}
+
+/*!
+    \internal
 */
 void QGraphicsViewPrivate::updateScroll()
 {
diff --git a/src/gui/graphicsview/qgraphicsview.h b/src/gui/graphicsview/qgraphicsview.h
index 2aed0e6d4f..90576e52f4 100644
--- a/src/gui/graphicsview/qgraphicsview.h
+++ b/src/gui/graphicsview/qgraphicsview.h
@@ -278,6 +278,7 @@ private:
     friend class QGraphicsSceneWidget;
     friend class QGraphicsScene;
     friend class QGraphicsScenePrivate;
+    friend class QGraphicsItemPrivate;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsView::CacheMode)
diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h
index cd161ada3e..d4b718e14b 100644
--- a/src/gui/graphicsview/qgraphicsview_p.h
+++ b/src/gui/graphicsview/qgraphicsview_p.h
@@ -86,6 +86,9 @@ public:
     qint64 horizontalScroll() const;
     qint64 verticalScroll() const;
 
+    QRectF mapRectToScene(const QRect &rect) const;
+    QRectF mapRectFromScene(const QRectF &rect) const;
+
     QPointF mousePressItemPoint;
     QPointF mousePressScenePoint;
     QPoint mousePressViewPoint;
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index fe569f4830..8de81c2082 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -1054,7 +1054,7 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
         break;
     case ItemParentChange: {
         QGraphicsItem *parent = qVariantValue<QGraphicsItem *>(value);
-        d->fixFocusChainBeforeReparenting((parent && parent->isWidget()) ? static_cast<QGraphicsWidget *>(parent) : 0);
+        d->fixFocusChainBeforeReparenting((parent && parent->isWidget()) ? static_cast<QGraphicsWidget *>(parent) : 0, scene());
 
         // Deliver ParentAboutToChange.
         QEvent event(QEvent::ParentAboutToChange);
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp
index b747a30649..5b6490fa4d 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.cpp
+++ b/src/gui/graphicsview/qgraphicswidget_p.cpp
@@ -743,7 +743,7 @@ bool QGraphicsWidgetPrivate::hasDecoration() const
 /**
  * is called after a reparent has taken place to fix up the focus chain(s)
  */
-void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *newScene)
+void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene)
 {
     Q_Q(QGraphicsWidget);
 
@@ -789,7 +789,7 @@ void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *new
     // update tabFocusFirst for oldScene if the item is going to be removed from oldScene
     if (newParent)
         newScene = newParent->scene();
-    QGraphicsScene *oldScene = q->scene();
+
     if (oldScene && newScene != oldScene)
         oldScene->d_func()->tabFocusFirst = firstOld;
 
diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h
index eb5364905e..65e69624d6 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.h
+++ b/src/gui/graphicsview/qgraphicswidget_p.h
@@ -98,7 +98,7 @@ public:
     mutable qreal *margins;
     void ensureMargins() const;
 
-    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *newScene = 0);
+    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = 0);
     void setLayout_helper(QGraphicsLayout *l);
 
     // Layouts
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index f61360a47b..9497a2f79f 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -51,6 +51,7 @@
 #include "qvarlengtharray.h"
 
 #include <QtDebug>
+#include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -70,7 +71,7 @@ static void insertOrRemoveItems(QVector<T> &items, int index, int delta)
 static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired)
 {
     Q_ASSERT(sumDesired != 0.0);
-    return desired * ::pow(sumAvailable / sumDesired, desired / sumDesired);
+    return desired * qPow(sumAvailable / sumDesired, desired / sumDesired);
 }
 
 static qreal fixedDescent(qreal descent, qreal ascent, qreal targetSize)
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index d8809ef114..ce7f450dde 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -165,12 +165,16 @@ public:
     QRect rect() const;
 
     int depth() const;
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numColors() const;
+#endif
     int colorCount() const;
 
     QRgb color(int i) const;
     void setColor(int i, QRgb c);
+#ifdef QT_DEPRECATED
     QT_DEPRECATED void setNumColors(int);
+#endif
     void setColorCount(int);
 
     bool allGray() const;
@@ -178,7 +182,9 @@ public:
 
     uchar *bits();
     const uchar *bits() const;
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numBytes() const;
+#endif
     int byteCount() const;
 
     uchar *scanLine(int);
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index d95b4eead8..e02b0d68a6 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -185,7 +185,9 @@ public:
     const uchar *qwsBits() const;
     int qwsBytesPerLine() const;
     QRgb *clut() const;
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numCols() const;
+#endif
     int colorCount() const;
 #elif defined(Q_WS_MAC)
     Qt::HANDLE macQDHandle() const;
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index dc33adedc4..8194db50f1 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -235,7 +235,7 @@ static CFbsBitmap* uncompress(CFbsBitmap* bitmap)
         QT_TRAP_THROWING(bitmapGc = CFbsBitGc::NewL());
         bitmapGc->Activate(bitmapDevice);
 
-        bitmapGc->DrawBitmap(TPoint(), bitmap);
+        bitmapGc->BitBlt(TPoint(), bitmap);
 
         delete bitmapGc;
         delete bitmapDevice;
@@ -346,8 +346,6 @@ QPixmap QPixmap::fromSymbianCFbsBitmap(CFbsBitmap *bitmap)
 QS60PixmapData::QS60PixmapData(PixelType type) : QRasterPixmapData(type),
     symbianBitmapDataAccess(new QSymbianBitmapDataAccess),
     cfbsBitmap(0),
-    bitmapDevice(0),
-    bitmapGc(0),
     pengine(0),
     bytes(0),
     formatLocked(false)
@@ -385,8 +383,6 @@ void QS60PixmapData::resize(int width, int height)
 
         if(cfbsBitmap->SizeInPixels() != newSize) {
             cfbsBitmap->Resize(TSize(width, height));
-            bitmapDevice->Resize(TSize(width, height));
-            bitmapGc->Resized();
             if(pengine) {
                 delete pengine;
                 pengine = 0;
@@ -397,21 +393,10 @@ void QS60PixmapData::resize(int width, int height)
     }
 }
 
-bool QS60PixmapData::initSymbianBitmapContext()
-{
-    QT_TRAP_THROWING(bitmapDevice = CFbsBitmapDevice::NewL(cfbsBitmap));
-    QT_TRAP_THROWING(bitmapGc = CFbsBitGc::NewL());
-    bitmapGc->Activate(bitmapDevice);
-
-    return true;
-}
-
 void QS60PixmapData::release()
 {
     if (cfbsBitmap) {
         QSymbianFbsHeapLock lock(QSymbianFbsHeapLock::Unlock);
-        delete bitmapGc;
-        delete bitmapDevice;
         delete cfbsBitmap;
         lock.relock();
     }
@@ -419,8 +404,6 @@ void QS60PixmapData::release()
     delete pengine;
     image = QImage();
     cfbsBitmap = 0;
-    bitmapGc = 0;
-    bitmapDevice = 0;
     pengine = 0;
     bytes = 0;
 }
@@ -428,42 +411,52 @@ void QS60PixmapData::release()
 /*!
  * Takes ownership of bitmap. Used by window surface
  */
-void QS60PixmapData::fromSymbianBitmap(CFbsBitmap* bitmap)
+void QS60PixmapData::fromSymbianBitmap(CFbsBitmap* bitmap, bool lockFormat)
 {
-	cfbsBitmap = bitmap;
-	formatLocked = true;
+    Q_ASSERT(bitmap);
 
-	 if(!initSymbianBitmapContext()) {
-		qWarning("Could not create CBitmapContext");
-		release();
-		return;
-	}
+    release();
+
+    cfbsBitmap = bitmap;
+    formatLocked = lockFormat;
 
-	setSerialNumber(cfbsBitmap->Handle());
+    setSerialNumber(cfbsBitmap->Handle());
 
-	UPDATE_BUFFER();
+    UPDATE_BUFFER();
 
-	// Create default palette if needed
-	if (cfbsBitmap->DisplayMode() == EGray2) {
-		image.setColorCount(2);
-		image.setColor(0, QColor(Qt::color0).rgba());
-		image.setColor(1, QColor(Qt::color1).rgba());
+    // Create default palette if needed
+    if (cfbsBitmap->DisplayMode() == EGray2) {
+        image.setColorCount(2);
+        image.setColor(0, QColor(Qt::color0).rgba());
+        image.setColor(1, QColor(Qt::color1).rgba());
 
         //Symbian thinks set pixels are white/transparent, Qt thinks they are foreground/solid
         //So invert mono bitmaps so that masks work correctly.
         image.invertPixels();
-	} else if (cfbsBitmap->DisplayMode() == EGray256) {
-		for (int i=0; i < 256; ++i)
-			image.setColor(i, qRgb(i, i, i));
-	}else if (cfbsBitmap->DisplayMode() == EColor256) {
-		const TColor256Util *palette = TColor256Util::Default();
-		for (int i=0; i < 256; ++i)
-			image.setColor(i, (QRgb)(palette->Color256(i).Value()));
-	}
+    } else if (cfbsBitmap->DisplayMode() == EGray256) {
+        for (int i=0; i < 256; ++i)
+            image.setColor(i, qRgb(i, i, i));
+    } else if (cfbsBitmap->DisplayMode() == EColor256) {
+        const TColor256Util *palette = TColor256Util::Default();
+        for (int i=0; i < 256; ++i)
+            image.setColor(i, (QRgb)(palette->Color256(i).Value()));
+    }
+}
+
+QImage QS60PixmapData::toImage(const QRect &r) const
+{
+    QS60PixmapData *that = const_cast<QS60PixmapData*>(this);
+    that->beginDataAccess();
+    QImage copy = that->image.copy(r);
+    that->endDataAccess();
+
+    return copy;
 }
 
 void QS60PixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags flags)
 {
+    release();
+
     QImage sourceImage;
 
     if (pixelType() == BitmapType) {
@@ -517,8 +510,8 @@ void QS60PixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags flags
     }
 
     cfbsBitmap = createSymbianCFbsBitmap(TSize(sourceImage.width(), sourceImage.height()), mode);
-    if (!(cfbsBitmap && initSymbianBitmapContext())) {
-        qWarning("Could not create CFbsBitmap and/or CBitmapContext");
+    if (!cfbsBitmap) {
+        qWarning("Could not create CFbsBitmap");
         release();
         return;
     }
@@ -544,17 +537,8 @@ void QS60PixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags flags
 
 void QS60PixmapData::copy(const QPixmapData *data, const QRect &rect)
 {
-    if (data->pixelType() == BitmapType) {
-        QBitmap::fromImage(data->toImage().copy(rect));
-        return;
-    }
-
     const QS60PixmapData *s60Data = static_cast<const QS60PixmapData*>(data);
-
-    resize(rect.width(), rect.height());
-    cfbsBitmap->SetDisplayMode(s60Data->cfbsBitmap->DisplayMode());
-
-    bitmapGc->BitBlt(TPoint(0, 0), s60Data->cfbsBitmap, qt_QRect2TRect(rect));
+    fromImage(s60Data->toImage(rect), Qt::AutoColor | Qt::OrderedAlphaDither);
 }
 
 bool QS60PixmapData::scroll(int dx, int dy, const QRect &rect)
@@ -661,12 +645,7 @@ void QS60PixmapData::setAlphaChannel(const QPixmap &alphaChannel)
 
 QImage QS60PixmapData::toImage() const
 {
-    QS60PixmapData *that = const_cast<QS60PixmapData*>(this);
-    that->beginDataAccess();
-    QImage copy = that->image.copy();
-    that->endDataAccess();
-
-    return copy;
+    return toImage(QRect());
 }
 
 QPaintEngine* QS60PixmapData::paintEngine() const
@@ -820,7 +799,9 @@ void* QS60PixmapData::toNativeType(NativeType type)
         if(displayMode == EGray2) {
             //Symbian thinks set pixels are white/transparent, Qt thinks they are foreground/solid
             //So invert mono bitmaps so that masks work correctly.
+            beginDataAccess();
             image.invertPixels();
+            endDataAccess();
             needsCopy = true;
         }
 
@@ -828,7 +809,9 @@ void* QS60PixmapData::toNativeType(NativeType type)
             QImage source;
 
             if (convertToArgb32) {
+                beginDataAccess();
                 source = image.convertToFormat(QImage::Format_ARGB32);
+                endDataAccess();
                 displayMode = EColor16MA;
             } else {
                 source = image;
@@ -858,7 +841,9 @@ void* QS60PixmapData::toNativeType(NativeType type)
 
         if(displayMode == EGray2) {
             // restore pixels
+            beginDataAccess();
             image.invertPixels();
+            endDataAccess();
         }
 
         return reinterpret_cast<void*>(bitmap);
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h
index 8631ebd29d..2d936226c3 100644
--- a/src/gui/image/qpixmap_s60_p.h
+++ b/src/gui/image/qpixmap_s60_p.h
@@ -109,14 +109,12 @@ public:
 
 private:
     void release();
-    void fromSymbianBitmap(CFbsBitmap* bitmap);
-    bool initSymbianBitmapContext();
+    void fromSymbianBitmap(CFbsBitmap* bitmap, bool lockFormat=false);
+    QImage toImage(const QRect &r) const;
 
     QSymbianBitmapDataAccess *symbianBitmapDataAccess;
 
     CFbsBitmap *cfbsBitmap;
-    CFbsBitmapDevice *bitmapDevice;
-    CFbsBitGc *bitmapGc;
     QPaintEngine *pengine;
     uchar* bytes;
 
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index b0b7d728fe..b7b29d7b57 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -424,6 +424,11 @@ QPixmapCache::KeyData* QPMCache::getKeyData(QPixmapCache::Key *key)
 
 Q_GLOBAL_STATIC(QPMCache, pm_cache)
 
+int Q_AUTOTEST_EXPORT q_QPixmapCache_keyHashSize()
+{
+    return pm_cache()->size();
+}
+
 QPixmapCacheEntry::~QPixmapCacheEntry()
 {
     pm_cache()->releaseKey(key);
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index 3723500cd9..caa07524c1 100644
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -52,6 +52,10 @@
 #include "private/qgraphicssystem_p.h"
 #include "private/qpaintengineex_p.h"
 #include "private/qpaintengine_raster_p.h"
+#include "qmath.h"
+#include "private/qmath_p.h"
+#include "private/qmemrotate_p.h"
+#include "private/qdrawhelper_p.h"
 
 #ifndef QT_NO_GRAPHICSEFFECT
 QT_BEGIN_NAMESPACE
@@ -585,106 +589,338 @@ QGraphicsBlurEffect::BlurHints QPixmapBlurFilter::blurHints() const
     return d->hints;
 }
 
+const qreal radiusScale = qreal(2.5);
+
 /*!
     \internal
 */
 QRectF QPixmapBlurFilter::boundingRectFor(const QRectF &rect) const
 {
     Q_D(const QPixmapBlurFilter);
-    const qreal delta = d->radius + 1;
+    const qreal delta = radiusScale * d->radius + 1;
     return rect.adjusted(-delta, -delta, delta, delta);
 }
 
-// Blur the image according to the blur radius
-// Based on exponential blur algorithm by Jani Huhtanen
-// (maximum radius is set to 16)
-static QImage blurred(const QImage& image, const QRect& rect, int radius, bool alphaOnly = false)
+template <int shift>
+static inline int static_shift(int value)
 {
-    int tab[] = { 14, 10, 8, 6, 5, 5, 4, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2 };
-    int alpha = (radius < 1)  ? 16 : (radius > 17) ? 1 : tab[radius-1];
+    if (shift == 0)
+        return value;
+    else if (shift > 0)
+        return value << (uint(shift) & 0x1f);
+    else
+        return value >> (uint(-shift) & 0x1f);
+}
 
-    QImage result = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
-    int r1 = rect.top();
-    int r2 = rect.bottom();
-    int c1 = rect.left();
-    int c2 = rect.right();
+template<int aprec, int zprec>
+static inline void blurinner(uchar *bptr, int &zR, int &zG, int &zB, int &zA, int alpha)
+{
+    QRgb *pixel = (QRgb *)bptr;
+
+#define Z_MASK (0xff << zprec)
+    const int A_zprec = static_shift<zprec - 24>(*pixel) & Z_MASK;
+    const int R_zprec = static_shift<zprec - 16>(*pixel) & Z_MASK;
+    const int G_zprec = static_shift<zprec - 8>(*pixel)  & Z_MASK;
+    const int B_zprec = static_shift<zprec>(*pixel)      & Z_MASK;
+#undef Z_MASK
+
+    const int zR_zprec = zR >> aprec;
+    const int zG_zprec = zG >> aprec;
+    const int zB_zprec = zB >> aprec;
+    const int zA_zprec = zA >> aprec;
+
+    zR += alpha * (R_zprec - zR_zprec);
+    zG += alpha * (G_zprec - zG_zprec);
+    zB += alpha * (B_zprec - zB_zprec);
+    zA += alpha * (A_zprec - zA_zprec);
+
+#define ZA_MASK (0xff << (zprec + aprec))
+    *pixel =
+        static_shift<24 - zprec - aprec>(zA & ZA_MASK)
+        | static_shift<16 - zprec - aprec>(zR & ZA_MASK)
+        | static_shift<8 - zprec - aprec>(zG & ZA_MASK)
+        | static_shift<-zprec - aprec>(zB & ZA_MASK);
+#undef ZA_MASK
+}
 
-    int bpl = result.bytesPerLine();
-    int rgba[4];
-    unsigned char* p;
+const int alphaIndex = (QSysInfo::ByteOrder == QSysInfo::BigEndian ? 0 : 3);
 
-    int i1 = 0;
-    int i2 = 3;
+template<int aprec, int zprec>
+static inline void blurinner_alphaOnly(uchar *bptr, int &z, int alpha)
+{
+    const int A_zprec = int(*(bptr)) << zprec;
+    const int z_zprec = z >> aprec;
+    z += alpha * (A_zprec - z_zprec);
+    *(bptr) = z >> (zprec + aprec);
+}
 
-    if (alphaOnly)
-        i1 = i2 = (QSysInfo::ByteOrder == QSysInfo::BigEndian ? 0 : 3);
+template<int aprec, int zprec, bool alphaOnly>
+static inline void blurrow(QImage & im, int line, int alpha)
+{
+    uchar *bptr = im.scanLine(line);
+
+    int zR = 0, zG = 0, zB = 0, zA = 0;
+
+    if (alphaOnly && im.format() != QImage::Format_Indexed8)
+        bptr += alphaIndex;
+
+    const int stride = im.depth() >> 3;
+    const int im_width = im.width();
+    for (int index = 0; index < im_width; ++index) {
+        if (alphaOnly)
+            blurinner_alphaOnly<aprec, zprec>(bptr, zA, alpha);
+        else
+            blurinner<aprec, zprec>(bptr, zR, zG, zB, zA, alpha);
+        bptr += stride;
+    }
+
+    bptr -= stride;
+
+    for (int index = im_width - 2; index >= 0; --index) {
+        bptr -= stride;
+        if (alphaOnly)
+            blurinner_alphaOnly<aprec, zprec>(bptr, zA, alpha);
+        else
+            blurinner<aprec, zprec>(bptr, zR, zG, zB, zA, alpha);
+    }
+}
+
+/*
+*  expblur(QImage &img, int radius)
+*
+*  Based on exponential blur algorithm by Jani Huhtanen
+*
+*  In-place blur of image 'img' with kernel
+*  of approximate radius 'radius'.
+*
+*  Blurs with two sided exponential impulse
+*  response.
+*
+*  aprec = precision of alpha parameter
+*  in fixed-point format 0.aprec
+*
+*  zprec = precision of state parameters
+*  zR,zG,zB and zA in fp format 8.zprec
+*/
+template <int aprec, int zprec, bool alphaOnly>
+void expblur(QImage &img, qreal radius, bool improvedQuality = false, int transposed = 0)
+{
+    // halve the radius if we're using two passes
+    if (improvedQuality)
+        radius *= qreal(0.5);
+
+    Q_ASSERT(img.format() == QImage::Format_ARGB32_Premultiplied
+             || img.format() == QImage::Format_RGB32);
+
+    // choose the alpha such that pixels at radius distance from a fully
+    // saturated pixel will have an alpha component of no greater than
+    // the cutOffIntensity
+    const qreal cutOffIntensity = 2;
+    int alpha = radius <= qreal(1e-5)
+        ? ((1 << aprec)-1)
+        : qRound((1<<aprec)*(1 - qPow(cutOffIntensity * (1 / qreal(255)), 1 / radius)));
+
+    int img_height = img.height();
+    for (int row = 0; row < img_height; ++row) {
+        for (int i = 0; i <= improvedQuality; ++i)
+            blurrow<aprec, zprec, alphaOnly>(img, row, alpha);
+    }
+
+    QImage temp(img.height(), img.width(), img.format());
+    if (transposed >= 0) {
+        if (img.depth() == 8) {
+            qt_memrotate270(reinterpret_cast<const quint8*>(img.bits()),
+                            img.width(), img.height(), img.bytesPerLine(),
+                            reinterpret_cast<quint8*>(temp.bits()),
+                            temp.bytesPerLine());
+        } else {
+            qt_memrotate270(reinterpret_cast<const quint32*>(img.bits()),
+                            img.width(), img.height(), img.bytesPerLine(),
+                            reinterpret_cast<quint32*>(temp.bits()),
+                            temp.bytesPerLine());
+        }
+    } else {
+        if (img.depth() == 8) {
+            qt_memrotate90(reinterpret_cast<const quint8*>(img.bits()),
+                           img.width(), img.height(), img.bytesPerLine(),
+                           reinterpret_cast<quint8*>(temp.bits()),
+                           temp.bytesPerLine());
+        } else {
+            qt_memrotate90(reinterpret_cast<const quint32*>(img.bits()),
+                           img.width(), img.height(), img.bytesPerLine(),
+                           reinterpret_cast<quint32*>(temp.bits()),
+                           temp.bytesPerLine());
+        }
+    }
 
-    for (int col = c1; col <= c2; col++) {
-        p = result.scanLine(r1) + col * 4;
-        for (int i = i1; i <= i2; i++)
-            rgba[i] = p[i] << 4;
+    img_height = temp.height();
+    for (int row = 0; row < img_height; ++row) {
+        for (int i = 0; i <= improvedQuality; ++i)
+            blurrow<aprec, zprec, alphaOnly>(temp, row, alpha);
+    }
 
-        p += bpl;
-        for (int j = r1; j < r2; j++, p += bpl)
-            for (int i = i1; i <= i2; i++)
-                p[i] = (rgba[i] += ((p[i] << 4) - rgba[i]) * alpha / 16) >> 4;
+    if (transposed == 0) {
+        qt_memrotate90(reinterpret_cast<const quint32*>(temp.bits()),
+                       temp.width(), temp.height(), temp.bytesPerLine(),
+                       reinterpret_cast<quint32*>(img.bits()),
+                       img.bytesPerLine());
+    } else {
+        img = temp;
     }
+}
+#define AVG(a,b)  ( ((((a)^(b)) & 0xfefefefeUL) >> 1) + ((a)&(b)) )
+#define AVG16(a,b)  ( ((((a)^(b)) & 0xf7deUL) >> 1) + ((a)&(b)) )
 
-    for (int row = r1; row <= r2; row++) {
-        p = result.scanLine(row) + c1 * 4;
-        for (int i = i1; i <= i2; i++)
-            rgba[i] = p[i] << 4;
+Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source)
+{
+    QImage srcImage = source;
+
+    if (source.format() == QImage::Format_Indexed8) {
+        // assumes grayscale
+        QImage dest(source.width() / 2, source.height() / 2, srcImage.format());
+
+        const uchar *src = reinterpret_cast<const uchar*>(const_cast<const QImage &>(srcImage).bits());
+        int sx = srcImage.bytesPerLine();
+        int sx2 = sx << 1;
+
+        uchar *dst = reinterpret_cast<uchar*>(dest.bits());
+        int dx = dest.bytesPerLine();
+        int ww = dest.width();
+        int hh = dest.height();
+
+        for (int y = hh; y; --y, dst += dx, src += sx2) {
+            const uchar *p1 = src;
+            const uchar *p2 = src + sx;
+            uchar *q = dst;
+            for (int x = ww; x; --x, ++q, p1 += 2, p2 += 2)
+                *q = ((int(p1[0]) + int(p1[1]) + int(p2[0]) + int(p2[1])) + 2) >> 2;
+        }
+
+        return dest;
+    } else if (source.format() == QImage::Format_ARGB8565_Premultiplied) {
+        QImage dest(source.width() / 2, source.height() / 2, srcImage.format());
+
+        const uchar *src = reinterpret_cast<const uchar*>(const_cast<const QImage &>(srcImage).bits());
+        int sx = srcImage.bytesPerLine();
+        int sx2 = sx << 1;
+
+        uchar *dst = reinterpret_cast<uchar*>(dest.bits());
+        int dx = dest.bytesPerLine();
+        int ww = dest.width();
+        int hh = dest.height();
+
+        for (int y = hh; y; --y, dst += dx, src += sx2) {
+            const uchar *p1 = src;
+            const uchar *p2 = src + sx;
+            uchar *q = dst;
+            for (int x = ww; x; --x, q += 3, p1 += 6, p2 += 6) {
+                // alpha
+                q[0] = AVG(AVG(p1[0], p1[3]), AVG(p2[0], p2[3]));
+                // rgb
+                const quint16 p16_1 = (p1[2] << 8) | p1[1];
+                const quint16 p16_2 = (p1[5] << 8) | p1[4];
+                const quint16 p16_3 = (p2[2] << 8) | p2[1];
+                const quint16 p16_4 = (p2[5] << 8) | p2[4];
+                const quint16 result = AVG16(AVG16(p16_1, p16_2), AVG16(p16_3, p16_4));
+                q[1] = result & 0xff;
+                q[2] = result >> 8;
+            }
+        }
 
-        p += 4;
-        for (int j = c1; j < c2; j++, p += 4)
-            for (int i = i1; i <= i2; i++)
-                p[i] = (rgba[i] += ((p[i] << 4) - rgba[i]) * alpha / 16) >> 4;
+        return dest;
+    } else if (source.format() != QImage::Format_ARGB32_Premultiplied
+               && source.format() != QImage::Format_RGB32)
+    {
+        srcImage = source.convertToFormat(QImage::Format_ARGB32_Premultiplied);
     }
 
-    for (int col = c1; col <= c2; col++) {
-        p = result.scanLine(r2) + col * 4;
-        for (int i = i1; i <= i2; i++)
-            rgba[i] = p[i] << 4;
+    QImage dest(source.width() / 2, source.height() / 2, srcImage.format());
+
+    const quint32 *src = reinterpret_cast<const quint32*>(const_cast<const QImage &>(srcImage).bits());
+    int sx = srcImage.bytesPerLine() >> 2;
+    int sx2 = sx << 1;
+
+    quint32 *dst = reinterpret_cast<quint32*>(dest.bits());
+    int dx = dest.bytesPerLine() >> 2;
+    int ww = dest.width();
+    int hh = dest.height();
 
-        p -= bpl;
-        for (int j = r1; j < r2; j++, p -= bpl)
-            for (int i = i1; i <= i2; i++)
-                p[i] = (rgba[i] += ((p[i] << 4) - rgba[i]) * alpha / 16) >> 4;
+    for (int y = hh; y; --y, dst += dx, src += sx2) {
+        const quint32 *p1 = src;
+        const quint32 *p2 = src + sx;
+        quint32 *q = dst;
+        for (int x = ww; x; --x, q++, p1 += 2, p2 += 2)
+            *q = AVG(AVG(p1[0], p1[1]), AVG(p2[0], p2[1]));
     }
 
-    for (int row = r1; row <= r2; row++) {
-        p = result.scanLine(row) + c2 * 4;
-        for (int i = i1; i <= i2; i++)
-            rgba[i] = p[i] << 4;
+    return dest;
+}
 
-        p -= 4;
-        for (int j = c1; j < c2; j++, p -= 4)
-            for (int i = i1; i <= i2; i++)
-                p[i] = (rgba[i] += ((p[i] << 4) - rgba[i]) * alpha / 16) >> 4;
+Q_GUI_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0)
+{
+    if (blurImage.format() != QImage::Format_ARGB32_Premultiplied
+        && blurImage.format() != QImage::Format_RGB32)
+    {
+        blurImage = blurImage.convertToFormat(QImage::Format_ARGB32_Premultiplied);
     }
 
-    return result;
+    qreal scale = 1;
+    if (radius >= 4) {
+        blurImage = qt_halfScaled(blurImage);
+        scale = 2;
+        radius *= qreal(0.5);
+    }
+
+    if (alphaOnly)
+        expblur<12, 10, true>(blurImage, radius, quality, transposed);
+    else
+        expblur<12, 10, false>(blurImage, radius, quality, transposed);
+
+    if (p) {
+        p->scale(scale, scale);
+        p->setRenderHint(QPainter::SmoothPixmapTransform);
+        p->drawImage(QRect(0, 0, blurImage.width(), blurImage.height()), blurImage);
+    }
+}
+
+Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0)
+{
+    if (blurImage.format() == QImage::Format_Indexed8)
+        expblur<12, 10, true>(blurImage, radius, quality, transposed);
+    else
+        expblur<12, 10, false>(blurImage, radius, quality, transposed);
 }
 
+bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
+
 /*!
     \internal
 */
-void QPixmapBlurFilter::draw(QPainter *painter, const QPointF &p, const QPixmap &src, const QRectF &srcRect) const
+void QPixmapBlurFilter::draw(QPainter *painter, const QPointF &p, const QPixmap &src, const QRectF &rect) const
 {
     Q_D(const QPixmapBlurFilter);
     if (!painter->isActive())
         return;
 
-    if (d->radius <= 0) {
+    QRectF srcRect = rect;
+    if (srcRect.isNull())
+        srcRect = src.rect();
+
+    if (d->radius <= 1) {
         painter->drawPixmap(srcRect.translated(p), src, srcRect);
         return;
     }
 
+    qreal scaledRadius = radiusScale * d->radius;
+    qreal scale;
+    if (qt_scaleForTransform(painter->transform(), &scale))
+        scaledRadius /= scale;
+
     QPixmapFilter *filter = painter->paintEngine() && painter->paintEngine()->isExtended() ?
         static_cast<QPaintEngineEx *>(painter->paintEngine())->pixmapFilter(type(), this) : 0;
     QPixmapBlurFilter *blurFilter = static_cast<QPixmapBlurFilter*>(filter);
     if (blurFilter) {
-        blurFilter->setRadius(d->radius);
+        blurFilter->setRadius(scaledRadius);
         blurFilter->setBlurHints(d->hints);
         blurFilter->draw(painter, p, src, srcRect);
         return;
@@ -693,17 +929,17 @@ void QPixmapBlurFilter::draw(QPainter *painter, const QPointF &p, const QPixmap
     QImage srcImage;
     QImage destImage;
 
-    if (srcRect.isNull()) {
+    if (srcRect == src.rect()) {
         srcImage = src.toImage();
-        destImage = blurred(srcImage, srcImage.rect(), qRound(d->radius));
     } else {
         QRect rect = srcRect.toAlignedRect().intersected(src.rect());
-
         srcImage = src.copy(rect).toImage();
-        destImage = blurred(srcImage, srcImage.rect(), qRound(d->radius));
     }
 
-    painter->drawImage(p, destImage);
+    QTransform transform = painter->worldTransform();
+    painter->translate(p);
+    qt_blurImage(painter, srcImage, scaledRadius, (d->hints & QGraphicsBlurEffect::QualityHint), false);
+    painter->setWorldTransform(transform);
 }
 
 // grayscales the image to dest (could be same). If rect isn't defined
@@ -1095,7 +1331,13 @@ void QPixmapDropShadowFilter::draw(QPainter *p,
     tmpPainter.end();
 
     // blur the alpha channel
-    tmp = blurred(tmp, tmp.rect(), qRound(d->radius), true);
+    QImage blurred(tmp.size(), QImage::Format_ARGB32_Premultiplied);
+    blurred.fill(0);
+    QPainter blurPainter(&blurred);
+    qt_blurImage(&blurPainter, tmp, d->radius, false, true);
+    blurPainter.end();
+
+    tmp = blurred;
 
     // blacken the image...
     tmpPainter.begin(&tmp);
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index a295d662db..1bf76624e4 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -139,8 +139,7 @@ void QCoeFepInputContext::widgetDestroyed(QWidget *w)
     // Make sure that the input capabilities of whatever new widget got focused are queried.
     CCoeControl *ctrl = w->effectiveWinId();
     if (ctrl->IsFocused()) {
-        ctrl->SetFocus(false);
-        ctrl->SetFocus(true);
+        queueInputCapabilitiesChanged();
     }
 }
 
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index de6e6cb2a7..f447989ff6 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -70,6 +70,7 @@ QAbstractItemViewPrivate::QAbstractItemViewPrivate()
         itemDelegate(0),
         selectionModel(0),
         ctrlDragSelectionFlag(QItemSelectionModel::NoUpdate),
+        noSelectionOnMousePress(false),
         selectionMode(QAbstractItemView::ExtendedSelection),
         selectionBehavior(QAbstractItemView::SelectItems),
         currentlyCommittingEditor(0),
@@ -1622,6 +1623,7 @@ void QAbstractItemView::mousePressEvent(QMouseEvent *event)
     d->pressedIndex = index;
     d->pressedModifiers = event->modifiers();
     QItemSelectionModel::SelectionFlags command = selectionCommand(index, event);
+    d->noSelectionOnMousePress = command == QItemSelectionModel::NoUpdate || !index.isValid();
     QPoint offset = d->offset();
     if ((command & QItemSelectionModel::Current) == 0)
         d->pressedPosition = pos + offset;
@@ -1760,9 +1762,10 @@ void QAbstractItemView::mouseReleaseEvent(QMouseEvent *event)
 
     d->ctrlDragSelectionFlag = QItemSelectionModel::NoUpdate;
 
-    //in the case the user presses on no item we might decide to clear the selection
-    if (d->selectionModel && !index.isValid())
-        d->selectionModel->select(QModelIndex(), selectionCommand(index, event));
+    if (d->selectionModel && d->noSelectionOnMousePress) {
+        d->noSelectionOnMousePress = false;
+        d->selectionModel->select(index, selectionCommand(index, event));
+    }
 
     setState(NoState);
 
@@ -2065,9 +2068,13 @@ void QAbstractItemView::focusInEvent(QFocusEvent *event)
 {
     Q_D(QAbstractItemView);
     QAbstractScrollArea::focusInEvent(event);
-    if (selectionModel()
+
+    const QItemSelectionModel* model = selectionModel();
+    const bool currentIndexValid = currentIndex().isValid();
+
+    if (model
         && !d->currentIndexSet
-        && !currentIndex().isValid()) {
+        && !currentIndexValid) {
         bool autoScroll = d->autoScroll;
         d->autoScroll = false;
         QModelIndex index = moveCursor(MoveNext, Qt::NoModifier); // first visible index
@@ -2075,6 +2082,17 @@ void QAbstractItemView::focusInEvent(QFocusEvent *event)
             selectionModel()->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
         d->autoScroll = autoScroll;
     }
+
+    if (model && currentIndexValid) {
+        if (currentIndex().flags() != Qt::ItemIsEditable)
+            setAttribute(Qt::WA_InputMethodEnabled, false);
+        else
+            setAttribute(Qt::WA_InputMethodEnabled);
+    }
+
+    if (!currentIndexValid)
+        setAttribute(Qt::WA_InputMethodEnabled, false);
+
     d->viewport->update();
 }
 
@@ -2867,6 +2885,8 @@ int QAbstractItemView::sizeHintForRow(int row) const
     if (row < 0 || row >= d->model->rowCount() || !model())
         return -1;
 
+    ensurePolished();
+
     QStyleOptionViewItemV4 option = d->viewOptionsV4();
     int height = 0;
     int colCount = d->model->columnCount(d->root);
@@ -2896,6 +2916,8 @@ int QAbstractItemView::sizeHintForColumn(int column) const
     if (column < 0 || column >= d->model->columnCount() || !model())
         return -1;
 
+    ensurePolished();
+
     QStyleOptionViewItemV4 option = d->viewOptionsV4();
     int width = 0;
     int rows = d->model->rowCount(d->root);
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 0b5cfbee16..7fc6780a4d 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -347,6 +347,7 @@ public:
     QMap<int, QPointer<QAbstractItemDelegate> > columnDelegates;
     QPointer<QItemSelectionModel> selectionModel;
     QItemSelectionModel::SelectionFlag ctrlDragSelectionFlag;
+    bool noSelectionOnMousePress;
 
     QAbstractItemView::SelectionMode selectionMode;
     QAbstractItemView::SelectionBehavior selectionBehavior;
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index 929d688488..0ce0e5ed12 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -173,7 +173,7 @@ void QListModel::move(int srcRow, int dstRow)
 {
     if (srcRow == dstRow
         || srcRow < 0 || srcRow >= items.count()
-        || dstRow < 0 || dstRow >= items.count())
+        || dstRow < 0 || dstRow > items.count())
         return;
 
     if (!beginMoveRows(QModelIndex(), srcRow, srcRow, QModelIndex(), dstRow))
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index 3ad9fbb67d..bcf9cfbcf3 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -2774,6 +2774,7 @@ int QTreeView::sizeHintForColumn(int column) const
     d->executePostedLayout();
     if (d->viewItems.isEmpty())
         return -1;
+    ensurePolished();
     int w = 0;
     QStyleOptionViewItemV4 option = d->viewOptionsV4();
     const QVector<QTreeViewItem> viewItems = d->viewItems;
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index ab57c329a1..27f2644fa8 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -361,6 +361,8 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop)
 
         SetFocusing(true);
         m_longTapDetector = QLongTapTimer::NewL(this);
+
+        DrawableWindow()->SetPointerGrab(ETrue);
     }
 }
 
@@ -472,41 +474,6 @@ void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent)
     QT_TRYCATCH_LEAVING(HandlePointerEvent(pEvent));
 }
 
-typedef QPair<QWidget*,QMouseEvent> Event;
-
-/*
- * Helper function called by HandlePointerEvent - separated to keep that function readable
- */
-static void generateEnterLeaveEvents(QList<Event> &events, QWidget *widgetUnderPointer,
-    QPoint globalPos, Qt::MouseButton button, Qt::KeyboardModifiers modifiers)
-{
-    //moved to another widget, create enter and leave events
-    if (S60->lastPointerEventTarget) {
-        QMouseEvent mEventLeave(QEvent::Leave, S60->lastPointerEventTarget->mapFromGlobal(
-            S60->lastCursorPos), S60->lastCursorPos, button, QApplicationPrivate::mouse_buttons,
-            modifiers);
-        events.append(Event(S60->lastPointerEventTarget, mEventLeave));
-    }
-    if (widgetUnderPointer) {
-        QMouseEvent mEventEnter(QEvent::Enter, widgetUnderPointer->mapFromGlobal(globalPos),
-            globalPos, button, QApplicationPrivate::mouse_buttons, modifiers);
-
-        events.append(Event(widgetUnderPointer, mEventEnter));
-#ifndef QT_NO_CURSOR
-        S60->curWin = widgetUnderPointer->effectiveWinId();
-        if (!QApplication::overrideCursor()) {
-#ifndef Q_SYMBIAN_FIXED_POINTER_CURSORS
-            if (S60->brokenPointerCursors)
-                qt_symbian_set_pointer_sprite(widgetUnderPointer->cursor());
-            else
-#endif
-                qt_symbian_setWindowCursor(widgetUnderPointer->cursor(), S60->curWin);
-        }
-#endif
-    }
-}
-
-
 void QSymbianControl::HandlePointerEvent(const TPointerEvent& pEvent)
 {
     QMouseEvent::Type type;
@@ -514,85 +481,77 @@ void QSymbianControl::HandlePointerEvent(const TPointerEvent& pEvent)
     mapS60MouseEventTypeToQt(&type, &button, &pEvent);
     Qt::KeyboardModifiers modifiers = mapToQtModifiers(pEvent.iModifiers);
 
-    if (type == QMouseEvent::None)
-        return;
-
-    // store events for later sending/saving
-    QList<Event > events;
-
     QPoint widgetPos = QPoint(pEvent.iPosition.iX, pEvent.iPosition.iY);
     TPoint controlScreenPos = PositionRelativeToScreen();
     QPoint globalPos = QPoint(controlScreenPos.iX, controlScreenPos.iY) + widgetPos;
+    S60->lastCursorPos = globalPos;
+    S60->lastPointerEventPos = widgetPos;
 
-    // widgets interested in the event
-    QWidget *widgetUnderPointer = qwidget->childAt(widgetPos);
-    if (!widgetUnderPointer)
-        widgetUnderPointer = qwidget; //i.e. this container widget
+    QWidget *mouseGrabber = QWidget::mouseGrabber();
 
-    QWidget *widgetWithMouseGrab = QWidget::mouseGrabber();
+    QWidget *popupWidget = qApp->activePopupWidget();
+    QWidget *popupReceiver = 0;
+    if (popupWidget) {
+        QWidget *popupChild = popupWidget->childAt(popupWidget->mapFromGlobal(globalPos));
+        popupReceiver = popupChild ? popupChild : popupWidget;
+    }
 
-    // handle auto grab of pointer when pressing / releasing
-    if (!widgetWithMouseGrab && type == QEvent::MouseButtonPress) {
-        //if previously auto-grabbed, generate a fake mouse release (platform bug: mouse release event was lost)
-        if (S60->mousePressTarget) {
-            QMouseEvent mEvent(QEvent::MouseButtonRelease, S60->mousePressTarget->mapFromGlobal(globalPos), globalPos,
-                button, QApplicationPrivate::mouse_buttons, modifiers);
-            events.append(Event(S60->mousePressTarget,mEvent));
+    if (mouseGrabber) {
+        if (popupReceiver) {
+            sendMouseEvent(popupReceiver, type, globalPos, button, modifiers);
+        } else {
+            sendMouseEvent(mouseGrabber, type, globalPos, button, modifiers);
         }
-        //auto grab the mouse
-        widgetWithMouseGrab = S60->mousePressTarget = widgetUnderPointer;
-        widgetWithMouseGrab->grabMouse();
-    }
-    if (widgetWithMouseGrab && widgetWithMouseGrab == S60->mousePressTarget && type == QEvent::MouseButtonRelease) {
-        //release the auto grab - note this release event still goes to the autograb widget
-        S60->mousePressTarget = 0;
-        widgetWithMouseGrab->releaseMouse();
+        // No Enter/Leave events in grabbing mode.
+        return;
     }
 
-    QWidget *widgetToReceiveMouseEvent;
-    if (widgetWithMouseGrab)
-        widgetToReceiveMouseEvent = widgetWithMouseGrab;
-    else
-        widgetToReceiveMouseEvent = widgetUnderPointer;
-
-    //queue QEvent::Enter and QEvent::Leave, if the pointer has moved
-    if (widgetUnderPointer != S60->lastPointerEventTarget && (type == QEvent::MouseButtonPress || type == QEvent::MouseButtonDblClick || type == QEvent::MouseMove))
-        generateEnterLeaveEvents(events, widgetUnderPointer, globalPos, button, modifiers);
+    QWidget *widgetUnderPointer = qwidget->childAt(widgetPos);
+    if (!widgetUnderPointer)
+        widgetUnderPointer = qwidget;
 
-    //save global state
-    S60->lastCursorPos = globalPos;
-    S60->lastPointerEventPos = widgetPos;
+    QApplicationPrivate::dispatchEnterLeave(widgetUnderPointer, S60->lastPointerEventTarget);
     S60->lastPointerEventTarget = widgetUnderPointer;
 
+    QWidget *receiver;
+    if (!popupReceiver && S60->mousePressTarget && type != QEvent::MouseButtonPress) {
+        receiver = S60->mousePressTarget;
+        if (type == QEvent::MouseButtonRelease)
+            S60->mousePressTarget = 0;
+    } else {
+        receiver = popupReceiver ? popupReceiver : widgetUnderPointer;
+        if (type == QEvent::MouseButtonPress)
+            S60->mousePressTarget = receiver;
+    }
+
 #if !defined(QT_NO_CURSOR) && !defined(Q_SYMBIAN_FIXED_POINTER_CURSORS)
     if (S60->brokenPointerCursors)
         qt_symbian_move_cursor_sprite();
 #endif
 
-    //queue this event.
-    Q_ASSERT(widgetToReceiveMouseEvent);
-    QMouseEvent mEvent(type, widgetToReceiveMouseEvent->mapFromGlobal(globalPos), globalPos,
+    sendMouseEvent(receiver, type, globalPos, button, modifiers);
+}
+
+void QSymbianControl::sendMouseEvent(
+        QWidget *receiver,
+        QEvent::Type type,
+        const QPoint &globalPos,
+        Qt::MouseButton button,
+        Qt::KeyboardModifiers modifiers)
+{
+    Q_ASSERT(receiver);
+    QMouseEvent mEvent(type, receiver->mapFromGlobal(globalPos), globalPos,
         button, QApplicationPrivate::mouse_buttons, modifiers);
-    events.append(Event(widgetToReceiveMouseEvent,mEvent));
     QEventDispatcherS60 *dispatcher;
     // It is theoretically possible for someone to install a different event dispatcher.
-    if ((dispatcher = qobject_cast<QEventDispatcherS60 *>(widgetToReceiveMouseEvent->d_func()->threadData->eventDispatcher)) != 0) {
+    if ((dispatcher = qobject_cast<QEventDispatcherS60 *>(receiver->d_func()->threadData->eventDispatcher)) != 0) {
         if (dispatcher->excludeUserInputEvents()) {
-            for (int i=0;i < events.count();++i)
-            {
-                Event next = events[i];
-                dispatcher->saveInputEvent(this, next.first, new QMouseEvent(next.second));
-            }
+            dispatcher->saveInputEvent(this, receiver, new QMouseEvent(mEvent));
             return;
         }
     }
 
-    //send events in the queue
-    for (int i=0;i < events.count();++i)
-    {
-        Event next = events[i];
-        sendMouseEvent(next.first, &(next.second));
-    }
+    sendMouseEvent(receiver, &mEvent);
 }
 
 bool QSymbianControl::sendMouseEvent(QWidget *widget, QMouseEvent *mEvent)
@@ -672,27 +631,58 @@ TKeyResponse QSymbianControl::OfferKeyEvent(const TKeyEvent& keyEvent, TEventCod
                         fakeEvent.iType = TPointerEvent::EButton1Up;
                     S60->virtualMouseAccel = 1;
                     S60->virtualMouseLastKey = 0;
+                    switch (keyCode) {
+                    case Qt::Key_Left:
+                        S60->virtualMousePressedKeys &= ~QS60Data::Left;
+                        break;
+                    case Qt::Key_Right:
+                        S60->virtualMousePressedKeys &= ~QS60Data::Right;
+                        break;
+                    case Qt::Key_Up:
+                        S60->virtualMousePressedKeys &= ~QS60Data::Up;
+                        break;
+                    case Qt::Key_Down:
+                        S60->virtualMousePressedKeys &= ~QS60Data::Down;
+                        break;
+                    case Qt::Key_Select:
+                        S60->virtualMousePressedKeys &= ~QS60Data::Select;
+                        break;
+                    }
                 }
                 else if (type == EEventKey) {
                     switch (keyCode) {
                     case Qt::Key_Left:
+                        S60->virtualMousePressedKeys |= QS60Data::Left;
                         x -= S60->virtualMouseAccel;
                         fakeEvent.iType = TPointerEvent::EMove;
                         break;
                     case Qt::Key_Right:
+                        S60->virtualMousePressedKeys |= QS60Data::Right;
                         x += S60->virtualMouseAccel;
                         fakeEvent.iType = TPointerEvent::EMove;
                         break;
                     case Qt::Key_Up:
+                        S60->virtualMousePressedKeys |= QS60Data::Up;
                         y -= S60->virtualMouseAccel;
                         fakeEvent.iType = TPointerEvent::EMove;
                         break;
                     case Qt::Key_Down:
+                        S60->virtualMousePressedKeys |= QS60Data::Down;
                         y += S60->virtualMouseAccel;
                         fakeEvent.iType = TPointerEvent::EMove;
                         break;
                     case Qt::Key_Select:
-                        fakeEvent.iType = TPointerEvent::EButton1Down;
+                        // Platform bug. If you start pressing several keys simultaneously (for
+                        // example for drag'n'drop), Symbian starts producing spurious up and
+                        // down messages for some keys. Therefore, make sure we have a clean slate
+                        // of pressed keys before starting a new button press.
+                        if (S60->virtualMousePressedKeys != 0) {
+                            S60->virtualMousePressedKeys |= QS60Data::Select;
+                            return EKeyWasConsumed;
+                        } else {
+                            S60->virtualMousePressedKeys |= QS60Data::Select;
+                            fakeEvent.iType = TPointerEvent::EButton1Down;
+                        }
                         break;
                     }
                 }
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 08f8bb5163..737e9d7e19 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -103,6 +103,14 @@ public:
     int defaultDpiY;
     WId curWin;
     int virtualMouseLastKey;
+    enum PressedKeys {
+        Select = 0x1,
+        Right = 0x2,
+        Down = 0x4,
+        Left = 0x8,
+        Up = 0x10
+    };
+    int virtualMousePressedKeys; // of the above type, but avoids casting problems
     int virtualMouseAccel;
     int virtualMouseMaxAccel;
 #ifndef Q_SYMBIAN_FIXED_POINTER_CURSORS
@@ -192,6 +200,12 @@ private:
     TKeyResponse OfferKeyEvent(const TKeyEvent& aKeyEvent,TEventCode aType);
     TKeyResponse sendKeyEvent(QWidget *widget, QKeyEvent *keyEvent);
     bool sendMouseEvent(QWidget *widget, QMouseEvent *mEvent);
+    void sendMouseEvent(
+            QWidget *receiver,
+            QEvent::Type type,
+            const QPoint &globalPos,
+            Qt::MouseButton button,
+            Qt::KeyboardModifiers modifiers);
     void HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& aPenEventScreenLocation );
 #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
     void translateAdvancedPointerEvent(const TAdvancedPointerEvent *event);
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index a6b4cef01b..f6264942ca 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -497,7 +497,7 @@ static bool addCircle(const QBezier *b, qreal offset, QBezier *o)
             cos_a = 1.;
         if (cos_a < -1.)
             cos_a = -1;
-        angles[i] = acos(cos_a)/Q_PI;
+        angles[i] = qAcos(cos_a)/Q_PI;
     }
 
     if (angles[0] + angles[1] > 1.) {
@@ -816,17 +816,17 @@ bool QBezier::findIntersections(const QBezier &a, const QBezier &b,
                                 QVector<QPair<qreal, qreal> > *t)
 {
     if (IntersectBB(a, b)) {
-        QPointF la1(fabs((a.x3 - a.x2) - (a.x2 - a.x1)),
-                    fabs((a.y3 - a.y2) - (a.y2 - a.y1)));
-	QPointF la2(fabs((a.x4 - a.x3) - (a.x3 - a.x2)),
-                    fabs((a.y4 - a.y3) - (a.y3 - a.y2)));
+        QPointF la1(qFabs((a.x3 - a.x2) - (a.x2 - a.x1)),
+                    qFabs((a.y3 - a.y2) - (a.y2 - a.y1)));
+	QPointF la2(qFabs((a.x4 - a.x3) - (a.x3 - a.x2)),
+                    qFabs((a.y4 - a.y3) - (a.y3 - a.y2)));
 	QPointF la;
 	if (la1.x() > la2.x()) la.setX(la1.x()); else la.setX(la2.x());
 	if (la1.y() > la2.y()) la.setY(la1.y()); else la.setY(la2.y());
-	QPointF lb1(fabs((b.x3 - b.x2) - (b.x2 - b.x1)),
-                    fabs((b.y3 - b.y2) - (b.y2 - b.y1)));
-	QPointF lb2(fabs((b.x4 - b.x3) - (b.x3 - b.x2)),
-                    fabs((b.y4 - b.y3) - (b.y3 - b.y2)));
+	QPointF lb1(qFabs((b.x3 - b.x2) - (b.x2 - b.x1)),
+                    qFabs((b.y3 - b.y2) - (b.y2 - b.y1)));
+	QPointF lb2(qFabs((b.x4 - b.x3) - (b.x3 - b.x2)),
+                    qFabs((b.y4 - b.y3) - (b.y3 - b.y2)));
 	QPointF lb;
 	if (lb1.x() > lb2.x()) lb.setX(lb1.x()); else lb.setX(lb2.x());
 	if (lb1.y() > lb2.y()) lb.setY(lb1.y()); else lb.setY(lb2.y());
@@ -1120,7 +1120,7 @@ static inline void bindInflectionPoint(const QBezier &bez, const qreal t,
     qreal ey = 3 * (right.y2 - right.y3);
 
     qreal s4 = qAbs(6 * (ey * ax - ex * ay) / qSqrt(ex * ex + ey * ey)) + 0.00001f;
-    qreal tf = pow(qreal(9 * flatness / s4), qreal(1./3.));
+    qreal tf = qPow(qreal(9 * flatness / s4), qreal(1./3.));
     *tMinus = t - (1 - t) * tf;
     *tPlus  = t + (1 - t) * tf;
 }
diff --git a/src/gui/painting/qbezier_p.h b/src/gui/painting/qbezier_p.h
index 7dbd0c279c..c2848710c5 100644
--- a/src/gui/painting/qbezier_p.h
+++ b/src/gui/painting/qbezier_p.h
@@ -166,8 +166,6 @@ inline void QBezier::coefficients(qreal t, qreal &a, qreal &b, qreal &c, qreal &
 
 inline QPointF QBezier::pointAt(qreal t) const
 {
-    Q_ASSERT(t >= 0);
-    Q_ASSERT(t <= 1);
 #if 1
     qreal a, b, c, d;
     coefficients(t, a, b, c, d);
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 4df7f8ab20..23236ece20 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -1182,7 +1182,7 @@ static const uint * QT_FASTCALL fetchConicalGradient(uint *buffer, const Operato
         rx -= data->gradient.conical.center.x;
         ry -= data->gradient.conical.center.y;
         while (buffer < end) {
-            qreal angle = atan2(ry, rx) + data->gradient.conical.angle;
+            qreal angle = qAtan2(ry, rx) + data->gradient.conical.angle;
 
             *buffer = qt_gradient_pixel(&data->gradient, 1 - angle / (2*Q_PI));
 
@@ -1196,7 +1196,7 @@ static const uint * QT_FASTCALL fetchConicalGradient(uint *buffer, const Operato
         if (!rw)
             rw = 1;
         while (buffer < end) {
-            qreal angle = atan2(ry/rw - data->gradient.conical.center.x,
+            qreal angle = qAtan2(ry/rw - data->gradient.conical.center.x,
                                 rx/rw - data->gradient.conical.center.y)
                           + data->gradient.conical.angle;
 
@@ -7140,17 +7140,17 @@ void qt_build_pow_tables() {
     }
 #else
     for (int i=0; i<256; ++i) {
-        qt_pow_rgb_gamma[i] = uchar(qRound(pow(i / qreal(255.0), smoothing) * 255));
-        qt_pow_rgb_invgamma[i] = uchar(qRound(pow(i / qreal(255.), 1 / smoothing) * 255));
+        qt_pow_rgb_gamma[i] = uchar(qRound(qPow(i / qreal(255.0), smoothing) * 255));
+        qt_pow_rgb_invgamma[i] = uchar(qRound(qPow(i / qreal(255.), 1 / smoothing) * 255));
     }
 #endif
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     const qreal gray_gamma = 2.31;
     for (int i=0; i<256; ++i)
-        qt_pow_gamma[i] = uint(qRound(pow(i / qreal(255.), gray_gamma) * 2047));
+        qt_pow_gamma[i] = uint(qRound(qPow(i / qreal(255.), gray_gamma) * 2047));
     for (int i=0; i<2048; ++i)
-        qt_pow_invgamma[i] = uchar(qRound(pow(i / 2047.0, 1 / gray_gamma) * 255));
+        qt_pow_invgamma[i] = uchar(qRound(qPow(i / 2047.0, 1 / gray_gamma) * 255));
 #endif
 }
 
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 152b3c9b40..af48bcbbf4 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -102,7 +102,9 @@ public:
 
     bool isInvertible() const { return !qFuzzyIsNull(_m11*_m22 - _m12*_m21); }
     qreal determinant() const { return _m11*_m22 - _m12*_m21; }
+#ifdef QT_DEPRECATED
     QT_DEPRECATED qreal det() const { return _m11*_m22 - _m12*_m21; }
+#endif
 
     QMatrix inverted(bool *invertible = 0) const;
 
diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp
index 67dc2c7954..e3a6f78d45 100644
--- a/src/gui/painting/qmemrotate.cpp
+++ b/src/gui/painting/qmemrotate.cpp
@@ -572,5 +572,26 @@ QT_IMPL_MEMROTATE(quint32, qrgb_generic16)
 QT_IMPL_MEMROTATE(quint16, qrgb_generic16)
 #endif
 
+struct qrgb_gl_rgba
+{
+public:
+    inline qrgb_gl_rgba(quint32 v) {
+        if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)
+            data = ((v << 16) & 0xff0000) | ((v >> 16) & 0xff) | (v & 0xff00ff00);
+        else
+            data = (v << 8) | ((v >> 24) & 0xff);
+    }
+
+    inline operator quint32() const { return data; }
+
+private:
+    quint32 data;
+} Q_PACKED;
+
+void Q_GUI_EXPORT qt_memrotate90_gl(const quint32 *src, int srcWidth, int srcHeight, int srcStride,
+                                    quint32 *dest, int dstStride)
+{
+    qt_memrotate90_template(src, srcWidth, srcHeight, srcStride, reinterpret_cast<qrgb_gl_rgba *>(dest), dstStride);
+}
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h
index 676a880cdf..8aee575fca 100644
--- a/src/gui/painting/qmemrotate_p.h
+++ b/src/gui/painting/qmemrotate_p.h
@@ -81,6 +81,8 @@ QT_BEGIN_NAMESPACE
     void Q_GUI_QWS_EXPORT qt_memrotate180(const srctype*, int, int, int, desttype*, int); \
     void Q_GUI_QWS_EXPORT qt_memrotate270(const srctype*, int, int, int, desttype*, int)
 
+void Q_GUI_EXPORT qt_memrotate90(const quint32*, int, int, int, quint32*, int);
+
 QT_DECL_MEMROTATE(quint32, quint32);
 QT_DECL_MEMROTATE(quint32, quint16);
 QT_DECL_MEMROTATE(quint16, quint32);
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 9148e4b7ec..0f8191e3a8 100644
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -96,7 +96,9 @@ public:
     int logicalDpiY() const { return metric(PdmDpiY); }
     int physicalDpiX() const { return metric(PdmPhysicalDpiX); }
     int physicalDpiY() const { return metric(PdmPhysicalDpiY); }
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numColors() const { return metric(PdmNumColors); }
+#endif
     int colorCount() const { return metric(PdmNumColors); }
     int depth() const { return metric(PdmDepth); }
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 4a7243447f..aa3b89e0a0 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3018,10 +3018,10 @@ void QRasterPaintEngine::drawCachedGlyphs(const QPointF &p, const QTextItemInt &
     QFontEngineGlyphCache::Type glyphType = ti.fontEngine->glyphFormat >= 0 ? QFontEngineGlyphCache::Type(ti.fontEngine->glyphFormat) : d->glyphCacheType;
 
     QImageTextureGlyphCache *cache =
-        (QImageTextureGlyphCache *) ti.fontEngine->glyphCache(glyphType, s->matrix);
+        (QImageTextureGlyphCache *) ti.fontEngine->glyphCache(0, glyphType, s->matrix);
     if (!cache) {
         cache = new QImageTextureGlyphCache(glyphType, s->matrix);
-        ti.fontEngine->setGlyphCache(glyphType, cache);
+        ti.fontEngine->setGlyphCache(0, cache);
     }
 
     cache->populate(ti, glyphs, positions);
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 66bf4f7fef..8ed126f5f1 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1317,6 +1317,90 @@ void QPainterPrivate::updateState(QPainterState *newState)
     Another workaround is to convert the paths to polygons first and then draw the
     polygons instead.
 
+    \section1 Performance
+
+    QPainter is a rich framework that allows developers to do a great
+    variety of graphical operations, such as gradients, composition
+    modes and vector graphics. And QPainter can do this across a
+    variety of different hardware and software stacks. Naturally the
+    underlying combination of hardware and software has some
+    implications for performance, and ensuring that every single
+    operation is fast in combination with all the various combinations
+    of composition modes, brushes, clipping, transformation, etc, is
+    close to an impossible task because of the number of
+    permutations. As a compromise we have selected a subset of the
+    QPainter API and backends, were performance is guaranteed to be as
+    good as we can sensibly get it for the given combination of
+    hardware and software.
+
+    The backends we focus on as high-performance engines are:
+
+    \list
+
+    \o Raster - This backend implements all rendering in pure software
+    and is always used to render into QImages. For optimal performance
+    only use the format types QImage::Format_ARGB32_Premultiplied,
+    QImage::Format_RGB32 or QImage::Format_RGB16. Any other format,
+    including QImage::Format_ARGB32, has significantly worse
+    performance. This engine is also used by default on Windows and on
+    QWS. It can be used as default graphics system on any
+    OS/hardware/software combination by passing \c {-graphicssystem
+    raster} on the command line
+
+    \o OpenGL 2.0 (ES) - This backend is the primary backend for
+    hardware accelerated graphics. It can be run on desktop machines
+    and embedded devices supporting the OpenGL 2.0 or OpenGL/ES 2.0
+    specification. This includes most graphics chips produced in the
+    last couple of years. The engine can be enabled by using QPainter
+    onto a QGLWidget or by passing \c {-graphicssystem opengl} on the
+    command line when the underlying system supports it.
+
+    \o OpenVG - This backend implements the Khronos standard for 2D
+    and Vector Graphics. It is primarily for embedded devices with
+    hardware support for OpenVG.  The engine can be enabled by
+    passing \c {-graphicssystem openvg} on the command line when
+    the underlying system supports it.
+
+    \endlist
+
+    These operations are:
+
+    \list
+
+    \o Simple transformations, meaning translation and scaling, pluss
+    0, 90, 180, 270 degree rotations.
+
+    \o \c drawPixmap() in combination with simple transformations and
+    opacity with non-smooth transformation mode
+    (\c QPainter::SmoothPixmapTransform not enabled as a render hint).
+
+    \o Text drawing with regular font sizes with simple
+    transformations with solid colors using no or 8-bit antialiasing.
+
+    \o Rectangle fills with solid color, two-color linear gradients
+    and simple transforms.
+
+    \o Rectangular clipping with simple transformations and intersect
+    clip.
+
+    \o Composition Modes \c QPainter::CompositionMode_Source and
+    QPainter::CompositionMode_SourceOver
+
+    \o Rounded rectangle filling using solid color and two-color
+    linear gradients fills.
+
+    \o 3x3 patched pixmaps, via qDrawBorderPixmap.
+
+    \endlist
+
+    This list gives an indication of which features to safely use in
+    an application where performance is critical. For certain setups,
+    other operations may be fast too, but before making extensive use
+    of them, it is recommended to benchmark and verify them on the
+    system where the software will run in the end. There are also
+    cases where expensive operations are ok to use, for instance when
+    the result is cached in a QPixmap.
+
     \sa QPaintDevice, QPaintEngine, {QtSvg Module}, {Basic Drawing Example},
         {Drawing Utility Functions}
 */
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index 51d6195ed8..a41ab6d24c 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -1209,7 +1209,7 @@ static qreal computeAngle(const QPointF &v)
     }
 #else
     // doesn't seem to be robust enough
-    return atan2(v.x(), v.y()) + Q_PI;
+    return qAtan2(v.x(), v.y()) + Q_PI;
 #endif
 }
 
diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp
index 6684ff75f1..930785b575 100644
--- a/src/gui/painting/qprinterinfo_unix.cpp
+++ b/src/gui/painting/qprinterinfo_unix.cpp
@@ -75,7 +75,9 @@ private:
     QString                     m_name;
     bool                        m_isNull;
     bool                        m_default;
-    QList<QPrinter::PaperSize>  m_paperSizes;
+    mutable bool                m_mustGetPaperSizes;
+    mutable QList<QPrinter::PaperSize> m_paperSizes;
+    int                         m_cupsPrinterIndex;
 
     QPrinterInfo*               q_ptr;
 };
@@ -838,16 +840,7 @@ QList<QPrinterInfo> QPrinterInfo::availablePrinters()
             list.append(QPrinterInfo(printerName));
             if (cupsPrinters[i].is_default)
                 list[i].d_ptr->m_default = true;
-            // Find paper sizes.
-            cups.setCurrentPrinter(i);
-            const ppd_option_t* sizes = cups.pageSizes();
-            if (sizes) {
-                for (int j = 0; j < sizes->num_choices; ++j) {
-                    list[i].d_ptr->m_paperSizes.append(
-                            QPrinterInfoPrivate::string2PaperSize(
-                            QLatin1String(sizes->choices[j].choice)));
-                }
-            }
+            list[i].d_ptr->m_cupsPrinterIndex = i;
         }
     } else {
 #endif
@@ -909,16 +902,7 @@ QPrinterInfo::QPrinterInfo(const QPrinter& printer)
             if (printerName == printer.printerName()) {
                 if (cupsPrinters[i].is_default)
                     d->m_default = true;
-                // Find paper sizes.
-                cups.setCurrentPrinter(i);
-                const ppd_option_t* sizes = cups.pageSizes();
-                if (sizes) {
-                    for (int j = 0; j < sizes->num_choices; ++j) {
-                        d->m_paperSizes.append(
-                                QPrinterInfoPrivate::string2PaperSize(
-                                QLatin1String(sizes->choices[j].choice)));
-                    }
-                }
+                d->m_cupsPrinterIndex = i;
                 return;
             }
         }
@@ -983,6 +967,26 @@ bool QPrinterInfo::isDefault() const
 QList< QPrinter::PaperSize> QPrinterInfo::supportedPaperSizes() const
 {
     const Q_D(QPrinterInfo);
+    if (d->m_mustGetPaperSizes) {
+        d->m_mustGetPaperSizes = false;
+
+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+        QCUPSSupport cups;
+        if (QCUPSSupport::isAvailable()) {
+            // Find paper sizes from CUPS.
+            cups.setCurrentPrinter(d->m_cupsPrinterIndex);
+            const ppd_option_t* sizes = cups.pageSizes();
+            if (sizes) {
+                for (int j = 0; j < sizes->num_choices; ++j) {
+                    d->m_paperSizes.append(
+                        QPrinterInfoPrivate::string2PaperSize(
+                            QLatin1String(sizes->choices[j].choice)));
+                }
+            }
+        }
+#endif
+
+    }
     return d->m_paperSizes;
 }
 
@@ -993,6 +997,8 @@ QPrinterInfoPrivate::QPrinterInfoPrivate()
 {
     m_isNull = true;
     m_default = false;
+    m_mustGetPaperSizes = true;
+    m_cupsPrinterIndex = 0;
     q_ptr = 0;
 }
 
@@ -1001,6 +1007,8 @@ QPrinterInfoPrivate::QPrinterInfoPrivate(const QString& name)
     m_name = name;
     m_isNull = false;
     m_default = false;
+    m_mustGetPaperSizes = true;
+    m_cupsPrinterIndex = 0;
     q_ptr = 0;
 }
 
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 2a1be86223..f99fbf6a67 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -116,7 +116,9 @@ public:
     QRect boundingRect() const;
     QVector<QRect> rects() const;
     void setRects(const QRect *rect, int num);
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numRects() const;
+#endif
     int rectCount() const;
 
     const QRegion operator|(const QRegion &r) const;
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index 228a6b12f3..8bb4728350 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -910,8 +910,8 @@ QPointF qt_curves_for_arc(const QRectF &rect, qreal startAngle, qreal sweepLengt
         }
     }
 
-    int startSegment = int(floor(startAngle / 90));
-    int endSegment = int(floor((startAngle + sweepLength) / 90));
+    int startSegment = int(qFloor(startAngle / 90));
+    int endSegment = int(qFloor((startAngle + sweepLength) / 90));
 
     qreal startT = (startAngle - startSegment * 90) / 90;
     qreal endT = (startAngle + sweepLength - endSegment * 90) / 90;
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index 57473d17ad..bb0c6304a1 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -76,7 +76,7 @@ class Q_GUI_EXPORT QTextureGlyphCache : public QFontEngineGlyphCache
 {
 public:
     QTextureGlyphCache(QFontEngineGlyphCache::Type type, const QTransform &matrix)
-        : QFontEngineGlyphCache(matrix), m_w(0), m_h(0), m_cx(0), m_cy(0), m_type(type) { }
+        : QFontEngineGlyphCache(matrix, type), m_w(0), m_h(0), m_cx(0), m_cy(0) { }
 
     virtual ~QTextureGlyphCache() { }
 
@@ -98,8 +98,6 @@ public:
     virtual void resizeTextureData(int width, int height) = 0;
     virtual int glyphMargin() const { return 0; }
 
-    QFontEngineGlyphCache::Type cacheType() const { return m_type; }
-
     virtual void fillTexture(const Coord &coord, glyph_t glyph) = 0;
 
     inline void createCache(int width, int height) {
@@ -121,7 +119,6 @@ protected:
     int m_h; // image height
     int m_cx; // current x
     int m_cy; // current y
-    QFontEngineGlyphCache::Type m_type;
 };
 
 
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index c66da7114d..15427c6fdf 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -68,12 +68,14 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget)
         mode = EColor16MA; // Try for transparency anyway
 
     // We create empty CFbsBitmap here -> it will be resized in setGeometry
-	CFbsBitmap *bitmap = q_check_ptr(new CFbsBitmap);	// CBase derived object needs check on new
+    CFbsBitmap *bitmap = q_check_ptr(new CFbsBitmap);	// CBase derived object needs check on new
     qt_symbian_throwIfError( bitmap->Create( TSize(0, 0), mode ) );
 	
     QS60PixmapData *data = new QS60PixmapData(QPixmapData::PixmapType);
-    data->fromSymbianBitmap(bitmap);
-    d_ptr->device = QPixmap(data);
+    if (data) {
+        data->fromSymbianBitmap(bitmap, true);
+        d_ptr->device = QPixmap(data);
+    }
         
     setStaticContentsSupport(true);
 }
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 5028e5f48b..c1beb6ad24 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -2775,7 +2775,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
             QSize size = (sr == SE_TabBarTabLeftButton) ? tab->leftButtonSize : tab->rightButtonSize;
             int w = size.width();
             int h = size.height();
-            int midHeight = static_cast<int>(ceil(float(tr.height() - h) / 2));
+            int midHeight = static_cast<int>(qCeil(float(tr.height() - h) / 2));
             int midWidth = ((tr.width() - w) / 2);
 
             bool atTheTop = true;
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index be4f15a05f..ed86f5a044 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -84,23 +84,15 @@ extern Q_GUI_EXPORT int qt_defaultDpiY();
 const QS60StylePrivate::SkinElementFlags QS60StylePrivate::KDefaultSkinElementFlags =
     SkinElementFlags(SF_PointNorth | SF_StateEnabled);
 
-static const QByteArray propertyKeyLayouts = "layouts";
-static const QByteArray propertyKeyCurrentlayout = "currentlayout";
-
 static const qreal goldenRatio = 1.618;
 
 const layoutHeader QS60StylePrivate::m_layoutHeaders[] = {
 // *** generated layout data ***
-{240,320,1,15,true,"QVGA Landscape Mirrored"},
-{240,320,1,15,false,"QVGA Landscape"},
-{320,240,1,15,true,"QVGA Portrait Mirrored"},
-{320,240,1,15,false,"QVGA Portrait"},
-{360,640,1,15,true,"NHD Landscape Mirrored"},
-{360,640,1,15,false,"NHD Landscape"},
-{640,360,1,15,true,"NHD Portrait Mirrored"},
-{640,360,1,15,false,"NHD Portrait"},
-{352,800,1,12,true,"E90 Landscape Mirrored"},
-{352,800,1,12,false,"E90 Landscape"}
+{240,320,1,15,"QVGA Landscape"},
+{320,240,1,15,"QVGA Portrait"},
+{360,640,1,15,"NHD Landscape"},
+{640,360,1,15,"NHD Portrait"},
+{352,800,1,12,"E90 Landscape"}
 // *** End of generated data ***
 };
 const int QS60StylePrivate::m_numberOfLayouts =
@@ -108,15 +100,10 @@ const int QS60StylePrivate::m_numberOfLayouts =
 
 const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** generated pixel metrics ***
-{5,0,-909,0,0,2,0,0,-1,7,12,19,13,13,6,200,-909,-909,-909,20,13,2,0,0,21,7,18,-909,3,3,1,-909,-909,0,1,0,0,12,20,15,15,18,18,1,115,18,0,-909,-909,-909,-909,0,0,16,2,-909,0,0,-909,16,-909,-909,-909,-909,32,18,55,24,55,3,3,4,9,13,-909,5,51,11,5,0,6,3,3,8,3,3,-909,2,-909,-909,-909,-909,5,5,3,1},
 {5,0,-909,0,0,2,0,0,-1,7,12,19,13,13,6,200,-909,-909,-909,20,13,2,0,0,21,7,18,-909,3,3,1,-909,-909,0,1,0,0,12,20,15,15,18,18,1,115,18,0,-909,-909,-909,-909,0,0,16,2,-909,0,0,-909,16,-909,-909,-909,-909,32,18,55,24,55,3,3,4,9,13,-909,5,51,11,5,0,3,3,6,8,3,3,-909,2,-909,-909,-909,-909,5,5,3,1},
-{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,8,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,7,4,4,9,4,4,-909,2,-909,-909,-909,-909,6,6,3,1},
 {5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,8,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,2,-909,-909,-909,-909,6,6,3,1},
-{7,0,-909,0,0,2,0,0,-1,25,69,28,19,19,9,258,-909,-909,-909,23,19,26,0,0,32,25,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,8,5,5,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1},
 {7,0,-909,0,0,2,0,0,-1,25,69,28,19,19,9,258,-909,-909,-909,23,19,26,0,0,32,25,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,25,68,28,19,19,9,258,-909,-909,-909,31,19,6,0,0,32,25,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,96,35,96,5,5,6,8,19,-909,7,74,22,7,0,8,5,5,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1},
 {7,0,-909,0,0,2,0,0,-1,25,68,28,19,19,9,258,-909,-909,-909,31,19,6,0,0,32,25,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,96,35,96,5,5,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,7,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,5,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,8,6,5,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1},
 {7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,7,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,6,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,5,6,8,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1}
 // *** End of generated data ***
 };
@@ -203,10 +190,24 @@ void QS60StylePrivate::drawSkinElement(SkinElements element, QPainter *painter,
             QS60StyleEnums::SP_QsnCpScrollHandleBottom, Qt::Vertical, painter, rect, flags | SF_PointNorth);
         break;
     case SE_SliderHandleHorizontal:
-        drawPart(QS60StyleEnums::SP_QgnIndiSliderEdit, painter, rect, flags | SF_PointNorth);
+        drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarker, painter, rect, flags | SF_PointNorth);
         break;
     case SE_SliderHandleVertical:
-        drawPart(QS60StyleEnums::SP_QgnIndiSliderEdit, painter, rect, flags | SF_PointEast);
+        drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarker, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_SliderHandleSelectedHorizontal:
+        drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_SliderHandleSelectedVertical:
+        drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_SliderGrooveVertical:
+        drawRow(QS60StyleEnums::SP_QgnGrafNsliderEndLeft, QS60StyleEnums::SP_QgnGrafNsliderMiddle,
+                QS60StyleEnums::SP_QgnGrafNsliderEndRight, Qt::Vertical, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_SliderGrooveHorizontal:
+        drawRow(QS60StyleEnums::SP_QgnGrafNsliderEndLeft, QS60StyleEnums::SP_QgnGrafNsliderMiddle,
+                QS60StyleEnums::SP_QgnGrafNsliderEndRight, Qt::Horizontal, painter, rect, flags | SF_PointNorth);
         break;
     case SE_TabBarTabEastActive:
         drawRow(QS60StyleEnums::SP_QgnGrafTabActiveL, QS60StyleEnums::SP_QgnGrafTabActiveM,
@@ -810,7 +811,15 @@ QSize QS60StylePrivate::partSize(QS60StyleEnums::SkinParts part, SkinElementFlag
             //ratio of 1:2 for horizontal tab bars (and 2:1 for vertical ones).
             result.setWidth(result.height()>>1);
             break;
-        case QS60StyleEnums::SP_QgnIndiSliderEdit:
+            
+        case QS60StyleEnums::SP_QgnGrafNsliderEndLeft:
+        case QS60StyleEnums::SP_QgnGrafNsliderEndRight:
+        case QS60StyleEnums::SP_QgnGrafNsliderMiddle:
+            result.setWidth(result.height()>>1);
+            break;
+            
+        case QS60StyleEnums::SP_QgnGrafNsliderMarker:
+        case QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected:
             result.scale(pixelMetric(QStyle::PM_SliderLength),
                 pixelMetric(QStyle::PM_SliderControlThickness), Qt::IgnoreAspectRatio);
             break;
@@ -931,22 +940,42 @@ void QS60Style::drawComplexControl(ComplexControl control, const QStyleOptionCom
     case CC_Slider:
         if (const QStyleOptionSlider *optionSlider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
 
-            // The groove is just a centered line. Maybe a qgn_graf_line_* at some point
             const QRect sliderGroove = subControlRect(control, optionSlider, SC_SliderGroove, widget);
-            const QPoint sliderGrooveCenter = sliderGroove.center();
             const bool horizontal = optionSlider->orientation == Qt::Horizontal;
-            painter->save();
-            if (widget)
-                painter->setPen(widget->palette().windowText().color());
-            if (horizontal)
-                painter->drawLine(0, sliderGrooveCenter.y(), sliderGroove.right(), sliderGrooveCenter.y());
-            else
-                painter->drawLine(sliderGrooveCenter.x(), 0, sliderGrooveCenter.x(), sliderGroove.bottom());
-            painter->restore();
 
+            //Highlight
+/*            if (optionSlider->state & QStyle::State_HasFocus)
+                drawPrimitive(PE_FrameFocusRect, optionSlider, painter, widget);*/
+            
+            //Groove graphics
+            if (QS60StylePrivate::hasSliderGrooveGraphic()) {
+                const QS60StylePrivate::SkinElements grooveElement = horizontal ? 
+                    QS60StylePrivate::SE_SliderGrooveHorizontal : 
+                    QS60StylePrivate::SE_SliderGrooveVertical;
+                QS60StylePrivate::drawSkinElement(grooveElement, painter, sliderGroove, flags);
+            } else {
+                const QRect sliderGroove = subControlRect(control, optionSlider, SC_SliderGroove, widget);
+                const QPoint sliderGrooveCenter = sliderGroove.center();
+                const bool horizontal = optionSlider->orientation == Qt::Horizontal;
+                painter->save();
+                if (widget)
+                    painter->setPen(widget->palette().windowText().color());
+                if (horizontal)
+                    painter->drawLine(0, sliderGrooveCenter.y(), sliderGroove.right(), sliderGrooveCenter.y());
+                else
+                    painter->drawLine(sliderGrooveCenter.x(), 0, sliderGrooveCenter.x(), sliderGroove.bottom());
+                painter->restore();
+            }
+
+            //Handle graphics
             const QRect sliderHandle = subControlRect(control, optionSlider, SC_SliderHandle, widget);
-            const QS60StylePrivate::SkinElements handleElement =
-                horizontal ? QS60StylePrivate::SE_SliderHandleHorizontal : QS60StylePrivate::SE_SliderHandleVertical;
+            QS60StylePrivate::SkinElements handleElement;
+            if (optionSlider->state & QStyle::State_Sunken)
+                handleElement =
+                        horizontal ? QS60StylePrivate::SE_SliderHandleSelectedHorizontal : QS60StylePrivate::SE_SliderHandleSelectedVertical;
+            else    
+                handleElement =
+                    horizontal ? QS60StylePrivate::SE_SliderHandleHorizontal : QS60StylePrivate::SE_SliderHandleVertical;
             QS60StylePrivate::drawSkinElement(handleElement, painter, sliderHandle, flags);
         }
         break;
@@ -1320,6 +1349,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
 
             painter->setClipRect(voptAdj.rect);
             const bool isSelected = (vopt->state & QStyle::State_Selected);
+            const bool hasFocus = (vopt->state & QStyle::State_HasFocus);
 
             bool isScrollBarVisible = false;
             int scrollBarWidth = 0;
@@ -1362,7 +1392,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
             } else { QCommonStyle::drawPrimitive(PE_PanelItemViewItem, &voptAdj, painter, widget);}
 
             // draw the focus rect
-            if (isSelected) {
+            if (isSelected | hasFocus) {
                 QRect highlightRect = option->rect.adjusted(1,1,-1,-1);
                 QAbstractItemView::SelectionBehavior selectionBehavior =
                     itemView ? itemView->selectionBehavior() : QAbstractItemView::SelectItems;
@@ -2241,11 +2271,13 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
         }
         break;
 
+    case PE_PanelScrollAreaCorner:
+        break;
+
         // todo: items are below with #ifdefs "just in case". in final version, remove all non-required cases
     case PE_FrameLineEdit:
     case PE_IndicatorDockWidgetResizeHandle:
     case PE_PanelTipLabel:
-    case PE_PanelScrollAreaCorner:
 
 #ifndef QT_NO_TABBAR
     case PE_IndicatorTabTear: // No tab tear in S60
@@ -2287,6 +2319,13 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const
             metricValue = -menuWidth;
         }
     }
+    //if layout direction is mirrored, switch left and right border margins
+    if (option && option->direction == Qt::RightToLeft) {
+        if (metric == PM_LayoutLeftMargin)
+            metricValue = QS60StylePrivate::pixelMetric(PM_LayoutRightMargin);
+        else if (metric == PM_LayoutRightMargin)
+            metricValue = QS60StylePrivate::pixelMetric(PM_LayoutLeftMargin);
+    }
     return metricValue;
 }
 
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 5ab230811e..65d7574fa8 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -119,6 +119,9 @@ public:
         SP_QgnGrafTabPassiveL,
         SP_QgnGrafTabPassiveM,
         SP_QgnGrafTabPassiveR,
+        SP_QgnGrafNsliderEndLeft,
+        SP_QgnGrafNsliderEndRight,
+        SP_QgnGrafNsliderMiddle,
         SP_QgnIndiCheckboxOff,
         SP_QgnIndiCheckboxOn,
         SP_QgnIndiHlColSuper,     // Available in S60 release 3.2 and later.
@@ -131,7 +134,8 @@ public:
         SP_QgnIndiNaviArrowRight,
         SP_QgnIndiRadiobuttOff,
         SP_QgnIndiRadiobuttOn,
-        SP_QgnIndiSliderEdit,
+        SP_QgnGrafNsliderMarker,
+        SP_QgnGrafNsliderMarkerSelected,
         SP_QgnIndiSubMenu,
         SP_QgnNoteErased,
         SP_QgnNoteError,
@@ -313,6 +317,10 @@ public:
         SE_ScrollBarHandleVertical,
         SE_SliderHandleHorizontal,
         SE_SliderHandleVertical,
+        SE_SliderHandleSelectedHorizontal,
+        SE_SliderHandleSelectedVertical,
+        SE_SliderGrooveVertical,
+        SE_SliderGrooveHorizontal,
         SE_TabBarTabEastActive,
         SE_TabBarTabEastInactive,
         SE_TabBarTabNorthActive,
@@ -403,6 +411,7 @@ public:
 
     static bool isTouchSupported();
     static bool isToolBarBackground();
+    static bool hasSliderGrooveGraphic();
 
     // calculates average color based on button skin graphics (minus borders).
     QColor colorFromFrameGraphics(SkinFrameElements frame) const;
@@ -443,7 +452,7 @@ public:
     static QSize naviPaneSize();
 
     //Checks that the current brush is transparent or has BrushStyle NoBrush,
-    //so that theme graphic background can be drawn. 
+    //so that theme graphic background can be drawn.
     static bool canDrawThemeBackground(const QBrush &backgroundBrush);
 
 private:
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 48b8fad267..13ac301c93 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -62,6 +62,7 @@
 #include <AknLayoutFont.h>
 #include <aknutils.h>
 #include <aknnavi.h>
+#include <gulicon.h>
 
 #if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN)
 
@@ -69,6 +70,7 @@ QT_BEGIN_NAMESPACE
 
 enum TDrawType {
     EDrawIcon,
+    EDrawGulIcon,
     EDrawBackground,
     ENoDraw
 };
@@ -80,8 +82,11 @@ enum TSupportRelease {
     ES60_5_0      = 0x0004,
     ES60_5_1      = 0x0008,
     ES60_5_2      = 0x0010,
+    ES60_3_X      = ES60_3_1 | ES60_3_2,
+    // Releases before Symbian Foundation
+    ES60_PreSF    = ES60_3_1 | ES60_3_2 | ES60_5_0,
     // Add all new releases here
-    ES60_AllReleases = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2
+    ES60_All = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2
 };
 
 typedef struct {
@@ -101,11 +106,12 @@ public:
     static QPixmap colorSkinnedGraphics(const QS60StyleEnums::SkinParts &stylepart,
         const QSize &size, QPainter *painter, QS60StylePrivate::SkinElementFlags flags);
     static QColor colorValue(const TAknsItemID &colorGroup, int colorIndex);
-    static QPixmap fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask, QS60StylePrivate::SkinElementFlags flags, QImage::Format format);
+    static QPixmap fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask, QS60StylePrivate::SkinElementFlags flags, const TSize& targetSize);
     static bool disabledPartGraphic(QS60StyleEnums::SkinParts &part);
     static bool disabledFrameGraphic(QS60StylePrivate::SkinFrameElements &frame);
     static QPixmap generateMissingThemeGraphic(QS60StyleEnums::SkinParts &part, const QSize &size, QS60StylePrivate::SkinElementFlags flags);
     static QSize naviPaneSize();
+    static TAknsItemID partSpecificThemeId(int part);
 
 private:
     static QPixmap createSkinnedGraphicsLX(QS60StyleEnums::SkinParts part,
@@ -115,209 +121,214 @@ private:
         const QSize &size, QPainter *painter, QS60StylePrivate::SkinElementFlags flags);
     static void frameIdAndCenterId(QS60StylePrivate::SkinFrameElements frameElement, TAknsItemID &frameId, TAknsItemID &centerId);
     static TRect innerRectFromElement(QS60StylePrivate::SkinFrameElements frameElement, const TRect &outerRect);
-    static void checkAndUnCompressBitmapL(CFbsBitmap*& aOriginalBitmap);
-    static void checkAndUnCompressBitmap(CFbsBitmap*& aOriginalBitmap);
-    static void unCompressBitmapL(const TRect& aTrgRect, CFbsBitmap* aTrgBitmap, CFbsBitmap* aSrcBitmap);
-    static void fallbackInfo(const QS60StyleEnums::SkinParts &stylepart, TDes& fallbackFileName, TInt& fallbackIndex);
+    static void fallbackInfo(const QS60StyleEnums::SkinParts &stylePart, TInt &fallbackIndex);
     static bool checkSupport(const int supportedRelease);
-    static TAknsItemID checkAndUpdateReleaseSpecificGraphics(int part);
     // Array to match the skin ID, fallback graphics and Qt widget graphics.
     static const partMapEntry m_partMap[];
 };
 
 const partMapEntry QS60StyleModeSpecifics::m_partMap[] = {
-    /* SP_QgnGrafBarWait */             {KAknsIIDQgnGrafBarWaitAnim,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafBarFrameCenter */      {KAknsIIDQgnGrafBarFrameCenter,         EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafBarFrameSideL */       {KAknsIIDQgnGrafBarFrameSideL,          EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafBarFrameSideR */       {KAknsIIDQgnGrafBarFrameSideR,          EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafBarProgress */         {KAknsIIDQgnGrafBarProgress,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafScrollArrowDown */     {KAknsIIDQgnGrafScrollArrowDown,        EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafScrollArrowLeft */     {KAknsIIDQgnGrafScrollArrowLeft,        EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafScrollArrowRight */    {KAknsIIDQgnGrafScrollArrowRight,       EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafScrollArrowUp */       {KAknsIIDQgnGrafScrollArrowUp,          EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafTabActiveL */          {KAknsIIDQgnGrafTabActiveL,             EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafTabActiveM */          {KAknsIIDQgnGrafTabActiveM,             EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafTabActiveR */          {KAknsIIDQgnGrafTabActiveR,             EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafTabPassiveL */         {KAknsIIDQgnGrafTabPassiveL,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafTabPassiveM */         {KAknsIIDQgnGrafTabPassiveM,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnGrafTabPassiveR */         {KAknsIIDQgnGrafTabPassiveR,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiCheckboxOff */         {KAknsIIDQgnIndiCheckboxOff,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiCheckboxOn */          {KAknsIIDQgnIndiCheckboxOn,             EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafBarWait */                {KAknsIIDQgnGrafBarWaitAnim,            EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafBarFrameCenter */         {KAknsIIDQgnGrafBarFrameCenter,         EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafBarFrameSideL */          {KAknsIIDQgnGrafBarFrameSideL,          EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafBarFrameSideR */          {KAknsIIDQgnGrafBarFrameSideR,          EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafBarProgress */            {KAknsIIDQgnGrafBarProgress,            EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafScrollArrowDown */        {KAknsIIDQgnGrafScrollArrowDown,     EDrawGulIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafScrollArrowLeft */        {KAknsIIDQgnGrafScrollArrowLeft,     EDrawGulIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafScrollArrowRight */       {KAknsIIDQgnGrafScrollArrowRight,    EDrawGulIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafScrollArrowUp */          {KAknsIIDQgnGrafScrollArrowUp,       EDrawGulIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafTabActiveL */             {KAknsIIDQgnGrafTabActiveL,             EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafTabActiveM */             {KAknsIIDQgnGrafTabActiveM,             EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafTabActiveR */             {KAknsIIDQgnGrafTabActiveR,             EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafTabPassiveL */            {KAknsIIDQgnGrafTabPassiveL,            EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafTabPassiveM */            {KAknsIIDQgnGrafTabPassiveM,            EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnGrafTabPassiveR */            {KAknsIIDQgnGrafTabPassiveR,            EDrawIcon,   ES60_All,    -1,-1},
+
+    // In 3.1 there is no slider groove.
+    /* SP_QgnGrafNsliderEndLeft */         {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x19cf /* KAknsIIDQgnGrafNsliderEndLeft */},
+    /* SP_QgnGrafNsliderEndRight */        {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x19d0 /* KAknsIIDQgnGrafNsliderEndRight */},
+    /* SP_QgnGrafNsliderMiddle */          {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x19d2 /* KAknsIIDQgnGrafNsliderMiddle */},
+    /* SP_QgnIndiCheckboxOff */            {KAknsIIDQgnIndiCheckboxOff,            EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnIndiCheckboxOn */             {KAknsIIDQgnIndiCheckboxOn,             EDrawIcon,   ES60_All,    -1,-1},
+
     // Following 5 items (SP_QgnIndiHlColSuper - SP_QgnIndiHlLineStraight) are available starting from S60 release 3.2.
     // In 3.1 CommonStyle drawing is used for these QTreeView elements, since no similar icons in AVKON UI.
-    /* SP_QgnIndiHlColSuper */          {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d5 /* KAknsIIDQgnIndiHlColSuper */},
-    /* SP_QgnIndiHlExpSuper */          {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d6 /* KAknsIIDQgnIndiHlExpSuper */},
-    /* SP_QgnIndiHlLineBranch */        {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d7 /* KAknsIIDQgnIndiHlLineBranch */},
-    /* SP_QgnIndiHlLineEnd */           {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d8 /* KAknsIIDQgnIndiHlLineEnd */},
-    /* SP_QgnIndiHlLineStraight */      {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d9 /* KAknsIIDQgnIndiHlLineStraight */},
-    /* SP_QgnIndiMarkedAdd */           {KAknsIIDQgnIndiMarkedAdd,              EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiNaviArrowLeft */       {KAknsIIDQgnGrafScrollArrowLeft,        EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiNaviArrowRight */      {KAknsIIDQgnGrafScrollArrowRight,       EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiRadiobuttOff */        {KAknsIIDQgnIndiRadiobuttOff,           EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiRadiobuttOn */         {KAknsIIDQgnIndiRadiobuttOn,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiSliderEdit */          {KAknsIIDQgnIndiSliderEdit,             EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnIndiSubMenu */             {KAknsIIDQgnIndiSubmenu,                EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnNoteErased */              {KAknsIIDQgnNoteErased,                 EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnNoteError */               {KAknsIIDQgnNoteError,                  EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnNoteInfo */                {KAknsIIDQgnNoteInfo,                   EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnNoteOk */                  {KAknsIIDQgnNoteOk,                     EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnNoteQuery */               {KAknsIIDQgnNoteQuery,                  EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnNoteWarning */             {KAknsIIDQgnNoteWarning,                EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnPropFileSmall */           {KAknsIIDQgnPropFileSmall,              EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnPropFolderCurrent */       {KAknsIIDQgnPropFolderCurrent,          EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnPropFolderSmall */         {KAknsIIDQgnPropFolderSmall,            EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnPropFolderSmallNew */      {KAknsIIDQgnPropFolderSmallNew,         EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QgnPropPhoneMemcLarge */      {KAknsIIDQgnPropPhoneMemcLarge,         EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiHlColSuper */             {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x17d5 /* KAknsIIDQgnIndiHlColSuper */},
+    /* SP_QgnIndiHlExpSuper */             {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x17d6 /* KAknsIIDQgnIndiHlExpSuper */},
+    /* SP_QgnIndiHlLineBranch */           {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x17d7 /* KAknsIIDQgnIndiHlLineBranch */},
+    /* SP_QgnIndiHlLineEnd */              {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x17d8 /* KAknsIIDQgnIndiHlLineEnd */},
+    /* SP_QgnIndiHlLineStraight */         {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x17d9 /* KAknsIIDQgnIndiHlLineStraight */},
+    /* SP_QgnIndiMarkedAdd */              {KAknsIIDQgnIndiMarkedAdd,              EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnIndiNaviArrowLeft */          {KAknsIIDQgnIndiNaviArrowLeft,          EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnIndiNaviArrowRight */         {KAknsIIDQgnIndiNaviArrowRight,         EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnIndiRadiobuttOff */           {KAknsIIDQgnIndiRadiobuttOff,           EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnIndiRadiobuttOn */            {KAknsIIDQgnIndiRadiobuttOn,            EDrawIcon,   ES60_All,    -1,-1},
+
+    // In 3.1 there different slider graphic and no pressed state.
+    /* SP_QgnGrafNsliderMarker */          {KAknsIIDQgnIndiSliderEdit,             EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x19d1 /* KAknsIIDQgnGrafNsliderMarker */},
+    /* SP_QgnGrafNsliderMarkerSelected */  {KAknsIIDQgnIndiSliderEdit,             EDrawIcon,   ES60_3_1,    EAknsMajorGeneric, 0x1a4a /* KAknsIIDQgnGrafNsliderMarkerSelected */},
+    /* SP_QgnIndiSubMenu */                {KAknsIIDQgnIndiSubmenu,                EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnNoteErased */                 {KAknsIIDQgnNoteErased,                 EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnNoteError */                  {KAknsIIDQgnNoteError,                  EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnNoteInfo */                   {KAknsIIDQgnNoteInfo,                   EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnNoteOk */                     {KAknsIIDQgnNoteOk,                     EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnNoteQuery */                  {KAknsIIDQgnNoteQuery,                  EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnNoteWarning */                {KAknsIIDQgnNoteWarning,                EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnPropFileSmall */              {KAknsIIDQgnPropFileSmall,              EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnPropFolderCurrent */          {KAknsIIDQgnPropFolderCurrent,          EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnPropFolderSmall */            {KAknsIIDQgnPropFolderSmall,            EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnPropFolderSmallNew */         {KAknsIIDQgnPropFolderSmallNew,         EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QgnPropPhoneMemcLarge */         {KAknsIIDQgnPropPhoneMemcLarge,         EDrawIcon,   ES60_All,    -1,-1},
 
     // 3.1 & 3.2 do not have pressed state for scrollbar, so use normal scrollbar graphics instead.
-    /* SP_QsnCpScrollHandleBottomPressed*/ {KAknsIIDQsnCpScrollHandleBottom,    EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorGeneric, 0x20f8}, /*KAknsIIDQsnCpScrollHandleBottomPressed*/
-    /* SP_QsnCpScrollHandleMiddlePressed*/ {KAknsIIDQsnCpScrollHandleMiddle,    EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorGeneric, 0x20f9}, /*KAknsIIDQsnCpScrollHandleMiddlePressed*/
-    /* SP_QsnCpScrollHandleTopPressed*/    {KAknsIIDQsnCpScrollHandleTop,       EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorGeneric, 0x20fa}, /*KAknsIIDQsnCpScrollHandleTopPressed*/
-
-    /* SP_QsnBgScreen */                {KAknsIIDQsnBgScreen,              EDrawBackground,  ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnCpScrollBgBottom */        {KAknsIIDQsnCpScrollBgBottom,           EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QsnCpScrollBgMiddle */        {KAknsIIDQsnCpScrollBgMiddle,           EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QsnCpScrollBgTop */           {KAknsIIDQsnCpScrollBgTop,              EDrawIcon,   ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnCpScrollHandleBottom */    {KAknsIIDQsnCpScrollHandleBottom,       EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QsnCpScrollHandleMiddle */    {KAknsIIDQsnCpScrollHandleMiddle,       EDrawIcon,   ES60_AllReleases,    -1,-1},
-    /* SP_QsnCpScrollHandleTop */       {KAknsIIDQsnCpScrollHandleTop,          EDrawIcon,   ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnFrButtonTbCornerTl */      {KAknsIIDQsnFrButtonTbCornerTl,         ENoDraw,     ES60_AllReleases,    -1,-1}, //todo: use "normal button" from 5.0 onwards
-    /* SP_QsnFrButtonTbCornerTr */      {KAknsIIDQsnFrButtonTbCornerTr,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbCornerBl */      {KAknsIIDQsnFrButtonTbCornerBl,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbCornerBr */      {KAknsIIDQsnFrButtonTbCornerBr,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideT */         {KAknsIIDQsnFrButtonTbSideT,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideB */         {KAknsIIDQsnFrButtonTbSideB,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideL */         {KAknsIIDQsnFrButtonTbSideL,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideR */         {KAknsIIDQsnFrButtonTbSideR,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbCenter */        {KAknsIIDQsnFrButtonTbCenter,           EDrawIcon,   ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnFrButtonTbCornerTlPressed */{KAknsIIDQsnFrButtonTbCornerTlPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbCornerTrPressed */{KAknsIIDQsnFrButtonTbCornerTrPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbCornerBlPressed */{KAknsIIDQsnFrButtonTbCornerBlPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbCornerBrPressed */{KAknsIIDQsnFrButtonTbCornerBrPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideTPressed */   {KAknsIIDQsnFrButtonTbSideTPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideBPressed */   {KAknsIIDQsnFrButtonTbSideBPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideLPressed */   {KAknsIIDQsnFrButtonTbSideLPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbSideRPressed */   {KAknsIIDQsnFrButtonTbSideRPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrButtonTbCenterPressed */  {KAknsIIDQsnFrButtonTbCenterPressed,   EDrawIcon,   ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnFrCaleCornerTl */          {KAknsIIDQsnFrCaleCornerTl,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleCornerTr */          {KAknsIIDQsnFrCaleCornerTr,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleCornerBl */          {KAknsIIDQsnFrCaleCornerBl,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleCornerBr */          {KAknsIIDQsnFrCaleCornerBr,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleGSideT */            {KAknsIIDQsnFrCaleSideT,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleGSideB */            {KAknsIIDQsnFrCaleSideB,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleGSideL */            {KAknsIIDQsnFrCaleSideL,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleGSideR */            {KAknsIIDQsnFrCaleSideR,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleCenter */            {KAknsIIDQsnFrCaleCenter,               ENoDraw,     ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnFrCaleHeadingCornerTl */   {KAknsIIDQsnFrCaleHeadingCornerTl,      ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingCornerTr */   {KAknsIIDQsnFrCaleHeadingCornerTr,      ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingCornerBl */   {KAknsIIDQsnFrCaleHeadingCornerBl,      ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingCornerBr */   {KAknsIIDQsnFrCaleHeadingCornerBr,      ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingSideT */      {KAknsIIDQsnFrCaleHeadingSideT,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingSideB */      {KAknsIIDQsnFrCaleHeadingSideB,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingSideL */      {KAknsIIDQsnFrCaleHeadingSideL,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingSideR */      {KAknsIIDQsnFrCaleHeadingSideR,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrCaleHeadingCenter */     {KAknsIIDQsnFrCaleHeadingCenter,        ENoDraw,     ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnFrInputCornerTl */         {KAknsIIDQsnFrInputCornerTl,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputCornerTr */         {KAknsIIDQsnFrInputCornerTr,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputCornerBl */         {KAknsIIDQsnFrInputCornerBl,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputCornerBr */         {KAknsIIDQsnFrInputCornerBr,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputSideT */            {KAknsIIDQsnFrInputSideT,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputSideB */            {KAknsIIDQsnFrInputSideB,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputSideL */            {KAknsIIDQsnFrInputSideL,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputSideR */            {KAknsIIDQsnFrInputSideR,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrInputCenter */           {KAknsIIDQsnFrInputCenter,              ENoDraw,     ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnFrListCornerTl */          {KAknsIIDQsnFrListCornerTl,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListCornerTr */          {KAknsIIDQsnFrListCornerTr,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListCornerBl */          {KAknsIIDQsnFrListCornerBl,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListCornerBr */          {KAknsIIDQsnFrListCornerBr,             ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListSideT */             {KAknsIIDQsnFrListSideT,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListSideB */             {KAknsIIDQsnFrListSideB,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListSideL */             {KAknsIIDQsnFrListSideL,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListSideR */             {KAknsIIDQsnFrListSideR,                ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrListCenter */            {KAknsIIDQsnFrListCenter,               ENoDraw,     ES60_AllReleases,    -1,-1},
-
-    /* SP_QsnFrPopupCornerTl */         {KAknsIIDQsnFrPopupCornerTl,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupCornerTr */         {KAknsIIDQsnFrPopupCornerTr,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupCornerBl */         {KAknsIIDQsnFrPopupCornerBl,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupCornerBr */         {KAknsIIDQsnFrPopupCornerBr,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupSideT */            {KAknsIIDQsnFrPopupSideT,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupSideB */            {KAknsIIDQsnFrPopupSideB,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupSideL */            {KAknsIIDQsnFrPopupSideL,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupSideR */            {KAknsIIDQsnFrPopupSideR,               ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrPopupCenter */           {KAknsIIDQsnFrPopupCenter,              ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnCpScrollHandleBottomPressed*/ {KAknsIIDQsnCpScrollHandleBottom,    EDrawIcon,   ES60_3_X,    EAknsMajorGeneric, 0x20f8}, /*KAknsIIDQsnCpScrollHandleBottomPressed*/
+    /* SP_QsnCpScrollHandleMiddlePressed*/ {KAknsIIDQsnCpScrollHandleMiddle,    EDrawIcon,   ES60_3_X,    EAknsMajorGeneric, 0x20f9}, /*KAknsIIDQsnCpScrollHandleMiddlePressed*/
+    /* SP_QsnCpScrollHandleTopPressed*/    {KAknsIIDQsnCpScrollHandleTop,       EDrawIcon,   ES60_3_X,    EAknsMajorGeneric, 0x20fa}, /*KAknsIIDQsnCpScrollHandleTopPressed*/
+
+    /* SP_QsnBgScreen */                {KAknsIIDQsnBgScreen,              EDrawBackground,  ES60_All,    -1,-1},
+
+    /* SP_QsnCpScrollBgBottom */        {KAknsIIDQsnCpScrollBgBottom,           EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QsnCpScrollBgMiddle */        {KAknsIIDQsnCpScrollBgMiddle,           EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QsnCpScrollBgTop */           {KAknsIIDQsnCpScrollBgTop,              EDrawIcon,   ES60_All,    -1,-1},
+
+    /* SP_QsnCpScrollHandleBottom */    {KAknsIIDQsnCpScrollHandleBottom,       EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QsnCpScrollHandleMiddle */    {KAknsIIDQsnCpScrollHandleMiddle,       EDrawIcon,   ES60_All,    -1,-1},
+    /* SP_QsnCpScrollHandleTop */       {KAknsIIDQsnCpScrollHandleTop,          EDrawIcon,   ES60_All,    -1,-1},
+
+    /* SP_QsnFrButtonTbCornerTl */      {KAknsIIDQsnFrButtonTbCornerTl,         ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbCornerTr */      {KAknsIIDQsnFrButtonTbCornerTr,         ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbCornerBl */      {KAknsIIDQsnFrButtonTbCornerBl,         ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbCornerBr */      {KAknsIIDQsnFrButtonTbCornerBr,         ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbSideT */         {KAknsIIDQsnFrButtonTbSideT,            ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbSideB */         {KAknsIIDQsnFrButtonTbSideB,            ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbSideL */         {KAknsIIDQsnFrButtonTbSideL,            ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbSideR */         {KAknsIIDQsnFrButtonTbSideR,            ENoDraw,     ES60_All,    -1, -1},
+    /* SP_QsnFrButtonTbCenter */        {KAknsIIDQsnFrButtonTbCenter,           EDrawIcon,   ES60_All,    -1, -1},
+
+    /* SP_QsnFrButtonTbCornerTlPressed */{KAknsIIDQsnFrButtonTbCornerTlPressed, ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbCornerTrPressed */{KAknsIIDQsnFrButtonTbCornerTrPressed, ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbCornerBlPressed */{KAknsIIDQsnFrButtonTbCornerBlPressed, ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbCornerBrPressed */{KAknsIIDQsnFrButtonTbCornerBrPressed, ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbSideTPressed */   {KAknsIIDQsnFrButtonTbSideTPressed,    ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbSideBPressed */   {KAknsIIDQsnFrButtonTbSideBPressed,    ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbSideLPressed */   {KAknsIIDQsnFrButtonTbSideLPressed,    ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbSideRPressed */   {KAknsIIDQsnFrButtonTbSideRPressed,    ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrButtonTbCenterPressed */  {KAknsIIDQsnFrButtonTbCenterPressed,   EDrawIcon,   ES60_All,    -1,-1},
+
+    /* SP_QsnFrCaleCornerTl */          {KAknsIIDQsnFrCaleCornerTl,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleCornerTr */          {KAknsIIDQsnFrCaleCornerTr,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleCornerBl */          {KAknsIIDQsnFrCaleCornerBl,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleCornerBr */          {KAknsIIDQsnFrCaleCornerBr,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleGSideT */            {KAknsIIDQsnFrCaleSideT,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleGSideB */            {KAknsIIDQsnFrCaleSideB,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleGSideL */            {KAknsIIDQsnFrCaleSideL,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleGSideR */            {KAknsIIDQsnFrCaleSideR,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleCenter */            {KAknsIIDQsnFrCaleCenter,               ENoDraw,     ES60_All,    -1,-1},
+
+    /* SP_QsnFrCaleHeadingCornerTl */   {KAknsIIDQsnFrCaleHeadingCornerTl,      ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingCornerTr */   {KAknsIIDQsnFrCaleHeadingCornerTr,      ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingCornerBl */   {KAknsIIDQsnFrCaleHeadingCornerBl,      ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingCornerBr */   {KAknsIIDQsnFrCaleHeadingCornerBr,      ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideT */      {KAknsIIDQsnFrCaleHeadingSideT,         ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideB */      {KAknsIIDQsnFrCaleHeadingSideB,         ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideL */      {KAknsIIDQsnFrCaleHeadingSideL,         ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideR */      {KAknsIIDQsnFrCaleHeadingSideR,         ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrCaleHeadingCenter */     {KAknsIIDQsnFrCaleHeadingCenter,        ENoDraw,     ES60_All,    -1,-1},
+
+    /* SP_QsnFrInputCornerTl */         {KAknsIIDQsnFrInputCornerTl,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputCornerTr */         {KAknsIIDQsnFrInputCornerTr,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputCornerBl */         {KAknsIIDQsnFrInputCornerBl,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputCornerBr */         {KAknsIIDQsnFrInputCornerBr,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputSideT */            {KAknsIIDQsnFrInputSideT,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputSideB */            {KAknsIIDQsnFrInputSideB,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputSideL */            {KAknsIIDQsnFrInputSideL,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputSideR */            {KAknsIIDQsnFrInputSideR,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrInputCenter */           {KAknsIIDQsnFrInputCenter,              ENoDraw,     ES60_All,    -1,-1},
+
+    /* SP_QsnFrListCornerTl */          {KAknsIIDQsnFrListCornerTl,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListCornerTr */          {KAknsIIDQsnFrListCornerTr,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListCornerBl */          {KAknsIIDQsnFrListCornerBl,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListCornerBr */          {KAknsIIDQsnFrListCornerBr,             ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListSideT */             {KAknsIIDQsnFrListSideT,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListSideB */             {KAknsIIDQsnFrListSideB,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListSideL */             {KAknsIIDQsnFrListSideL,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListSideR */             {KAknsIIDQsnFrListSideR,                ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrListCenter */            {KAknsIIDQsnFrListCenter,               ENoDraw,     ES60_All,    -1,-1},
+
+    /* SP_QsnFrPopupCornerTl */         {KAknsIIDQsnFrPopupCornerTl,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupCornerTr */         {KAknsIIDQsnFrPopupCornerTr,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupCornerBl */         {KAknsIIDQsnFrPopupCornerBl,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupCornerBr */         {KAknsIIDQsnFrPopupCornerBr,            ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupSideT */            {KAknsIIDQsnFrPopupSideT,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupSideB */            {KAknsIIDQsnFrPopupSideB,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupSideL */            {KAknsIIDQsnFrPopupSideL,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupSideR */            {KAknsIIDQsnFrPopupSideR,               ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrPopupCenter */           {KAknsIIDQsnFrPopupCenter,              ENoDraw,     ES60_All,    -1,-1},
 
     // ToolTip graphics different in 3.1 vs. 3.2+.
-    /* SP_QsnFrPopupPreviewCornerTl */  {KAknsIIDQsnFrPopupCornerTl,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c5}, /* KAknsIIDQsnFrPopupPreviewCornerTl */
-    /* SP_QsnFrPopupPreviewCornerTr */  {KAknsIIDQsnFrPopupCornerTr,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c6},
-    /* SP_QsnFrPopupPreviewCornerBl */  {KAknsIIDQsnFrPopupCornerBl,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c3},
-    /* SP_QsnFrPopupPreviewCornerBr */  {KAknsIIDQsnFrPopupCornerBr,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c4},
-    /* SP_QsnFrPopupPreviewSideT */     {KAknsIIDQsnFrPopupSideT,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19ca},
-    /* SP_QsnFrPopupPreviewSideB */     {KAknsIIDQsnFrPopupSideB,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c7},
-    /* SP_QsnFrPopupPreviewSideL */     {KAknsIIDQsnFrPopupSideL,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c8},
-    /* SP_QsnFrPopupPreviewSideR */     {KAknsIIDQsnFrPopupSideR,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c9},
-    /* SP_QsnFrPopupPreviewCenter */    {KAknsIIDQsnFrPopupCenter,              ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c2},
-
-    /* SP_QsnFrSetOptCornerTl */        {KAknsIIDQsnFrSetOptCornerTl,           ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptCornerTr */        {KAknsIIDQsnFrSetOptCornerTr,           ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptCornerBl */        {KAknsIIDQsnFrSetOptCornerBl,           ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptCornerBr */        {KAknsIIDQsnFrSetOptCornerBr,           ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptSideT */           {KAknsIIDQsnFrSetOptSideT,              ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptSideB */           {KAknsIIDQsnFrSetOptSideB,              ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptSideL */           {KAknsIIDQsnFrSetOptSideL,              ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptSideR */           {KAknsIIDQsnFrSetOptSideR,              ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrSetOptCenter */          {KAknsIIDQsnFrSetOptCenter,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupPreviewCornerTl */  {KAknsIIDQsnFrPopupCornerTl,            ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c5}, /* KAknsIIDQsnFrPopupPreviewCornerTl */
+    /* SP_QsnFrPopupPreviewCornerTr */  {KAknsIIDQsnFrPopupCornerTr,            ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c6},
+    /* SP_QsnFrPopupPreviewCornerBl */  {KAknsIIDQsnFrPopupCornerBl,            ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c3},
+    /* SP_QsnFrPopupPreviewCornerBr */  {KAknsIIDQsnFrPopupCornerBr,            ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c4},
+    /* SP_QsnFrPopupPreviewSideT */     {KAknsIIDQsnFrPopupSideT,               ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19ca},
+    /* SP_QsnFrPopupPreviewSideB */     {KAknsIIDQsnFrPopupSideB,               ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c7},
+    /* SP_QsnFrPopupPreviewSideL */     {KAknsIIDQsnFrPopupSideL,               ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c8},
+    /* SP_QsnFrPopupPreviewSideR */     {KAknsIIDQsnFrPopupSideR,               ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c9},
+    /* SP_QsnFrPopupPreviewCenter */    {KAknsIIDQsnFrPopupCenter,              ENoDraw,     ES60_3_1,    EAknsMajorSkin, 0x19c2},
+
+    /* SP_QsnFrSetOptCornerTl */        {KAknsIIDQsnFrSetOptCornerTl,           ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptCornerTr */        {KAknsIIDQsnFrSetOptCornerTr,           ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptCornerBl */        {KAknsIIDQsnFrSetOptCornerBl,           ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptCornerBr */        {KAknsIIDQsnFrSetOptCornerBr,           ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptSideT */           {KAknsIIDQsnFrSetOptSideT,              ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptSideB */           {KAknsIIDQsnFrSetOptSideB,              ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptSideL */           {KAknsIIDQsnFrSetOptSideL,              ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptSideR */           {KAknsIIDQsnFrSetOptSideR,              ENoDraw,     ES60_All,    -1,-1},
+    /* SP_QsnFrSetOptCenter */          {KAknsIIDQsnFrSetOptCenter,             ENoDraw,     ES60_All,    -1,-1},
 
     // No toolbar frame for 5.0+ releases.
-    /* SP_QsnFrPopupSubCornerTl */      {KAknsIIDQsnFrPopupSubCornerTl,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubCornerTr */      {KAknsIIDQsnFrPopupSubCornerTr,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubCornerBl */      {KAknsIIDQsnFrPopupSubCornerBl,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubCornerBr */      {KAknsIIDQsnFrPopupSubCornerBr,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubSideT */         {KAknsIIDQsnFrPopupSubSideT,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubSideB */         {KAknsIIDQsnFrPopupSubSideB,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubSideL */         {KAknsIIDQsnFrPopupSubSideL,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubSideR */         {KAknsIIDQsnFrPopupSubSideR,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
-    /* SP_QsnFrPopupSubCenter */        {KAknsIIDQsnFrPopupCenterSubmenu,       ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubCornerTl */      {KAknsIIDQsnFrPopupSubCornerTl,         ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubCornerTr */      {KAknsIIDQsnFrPopupSubCornerTr,         ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubCornerBl */      {KAknsIIDQsnFrPopupSubCornerBl,         ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubCornerBr */      {KAknsIIDQsnFrPopupSubCornerBr,         ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubSideT */         {KAknsIIDQsnFrPopupSubSideT,            ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubSideB */         {KAknsIIDQsnFrPopupSubSideB,            ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubSideL */         {KAknsIIDQsnFrPopupSubSideL,            ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubSideR */         {KAknsIIDQsnFrPopupSubSideR,            ENoDraw,     ES60_3_X,    -1,-1},
+    /* SP_QsnFrPopupSubCenter */        {KAknsIIDQsnFrPopupCenterSubmenu,       ENoDraw,     ES60_3_X,    -1,-1},
 
     // Toolbar graphics is different in 3.1/3.2 vs. 5.0
-    /* SP_QsnFrSctrlButtonCornerTl */   {KAknsIIDQsnFrButtonTbCornerTl,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2301}, /* KAknsIIDQgnFrSctrlButtonCornerTl*/
-    /* SP_QsnFrSctrlButtonCornerTr */   {KAknsIIDQsnFrButtonTbCornerTr,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2302},
-    /* SP_QsnFrSctrlButtonCornerBl */   {KAknsIIDQsnFrButtonTbCornerBl,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2303},
-    /* SP_QsnFrSctrlButtonCornerBr */   {KAknsIIDQsnFrButtonTbCornerBr,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2304},
-    /* SP_QsnFrSctrlButtonSideT */      {KAknsIIDQsnFrButtonTbSideT,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2305},
-    /* SP_QsnFrSctrlButtonSideB */      {KAknsIIDQsnFrButtonTbSideB,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2306},
-    /* SP_QsnFrSctrlButtonSideL */      {KAknsIIDQsnFrButtonTbSideL,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2307},
-    /* SP_QsnFrSctrlButtonSideR */      {KAknsIIDQsnFrButtonTbSideR,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2308},
-    /* SP_QsnFrSctrlButtonCenter */     {KAknsIIDQsnFrButtonTbCenter,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2309}, /*KAknsIIDQgnFrSctrlButtonCenter*/
+    /* SP_QsnFrSctrlButtonCornerTl */   {KAknsIIDQsnFrButtonTbCornerTl,         ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2301}, /* KAknsIIDQgnFrSctrlButtonCornerTl*/
+    /* SP_QsnFrSctrlButtonCornerTr */   {KAknsIIDQsnFrButtonTbCornerTr,         ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2302},
+    /* SP_QsnFrSctrlButtonCornerBl */   {KAknsIIDQsnFrButtonTbCornerBl,         ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2303},
+    /* SP_QsnFrSctrlButtonCornerBr */   {KAknsIIDQsnFrButtonTbCornerBr,         ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2304},
+    /* SP_QsnFrSctrlButtonSideT */      {KAknsIIDQsnFrButtonTbSideT,            ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2305},
+    /* SP_QsnFrSctrlButtonSideB */      {KAknsIIDQsnFrButtonTbSideB,            ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2306},
+    /* SP_QsnFrSctrlButtonSideL */      {KAknsIIDQsnFrButtonTbSideL,            ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2307},
+    /* SP_QsnFrSctrlButtonSideR */      {KAknsIIDQsnFrButtonTbSideR,            ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2308},
+    /* SP_QsnFrSctrlButtonCenter */     {KAknsIIDQsnFrButtonTbCenter,           ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2309}, /*KAknsIIDQgnFrSctrlButtonCenter*/
 
     // No pressed state for toolbar button in 3.1/3.2.
-    /* SP_QsnFrSctrlButtonCornerTlPressed */ {KAknsIIDQsnFrButtonTbCornerTl,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2621},  /*KAknsIIDQsnFrSctrlButtonCornerTlPressed*/
-    /* SP_QsnFrSctrlButtonCornerTrPressed */ {KAknsIIDQsnFrButtonTbCornerTr,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2622},
-    /* SP_QsnFrSctrlButtonCornerBlPressed */ {KAknsIIDQsnFrButtonTbCornerBl,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2623},
-    /* SP_QsnFrSctrlButtonCornerBrPressed */ {KAknsIIDQsnFrButtonTbCornerBr,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2624},
-    /* SP_QsnFrSctrlButtonSideTPressed */    {KAknsIIDQsnFrButtonTbSideT,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2625},
-    /* SP_QsnFrSctrlButtonSideBPressed */    {KAknsIIDQsnFrButtonTbSideB,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2626},
-    /* SP_QsnFrSctrlButtonSideLPressed */    {KAknsIIDQsnFrButtonTbSideL,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2627},
-    /* SP_QsnFrSctrlButtonSideRPressed */    {KAknsIIDQsnFrButtonTbSideR,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2628},
-    /* SP_QsnFrSctrlButtonCenterPressed */   {KAknsIIDQsnFrButtonTbCenter,      ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2629},
+    /* SP_QsnFrSctrlButtonCornerTlPressed */ {KAknsIIDQsnFrButtonTbCornerTl,    ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2621},  /*KAknsIIDQsnFrSctrlButtonCornerTlPressed*/
+    /* SP_QsnFrSctrlButtonCornerTrPressed */ {KAknsIIDQsnFrButtonTbCornerTr,    ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2622},
+    /* SP_QsnFrSctrlButtonCornerBlPressed */ {KAknsIIDQsnFrButtonTbCornerBl,    ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2623},
+    /* SP_QsnFrSctrlButtonCornerBrPressed */ {KAknsIIDQsnFrButtonTbCornerBr,    ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2624},
+    /* SP_QsnFrSctrlButtonSideTPressed */    {KAknsIIDQsnFrButtonTbSideT,       ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2625},
+    /* SP_QsnFrSctrlButtonSideBPressed */    {KAknsIIDQsnFrButtonTbSideB,       ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2626},
+    /* SP_QsnFrSctrlButtonSideLPressed */    {KAknsIIDQsnFrButtonTbSideL,       ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2627},
+    /* SP_QsnFrSctrlButtonSideRPressed */    {KAknsIIDQsnFrButtonTbSideR,       ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2628},
+    /* SP_QsnFrSctrlButtonCenterPressed */   {KAknsIIDQsnFrButtonTbCenter,      ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2629},
 
     // No inactive button graphics in 3.1/3.2
-    /* SP_QsnFrButtonCornerTlInactive */ {KAknsIIDQsnFrButtonTbCornerTl,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b1}, /*KAknsIIDQsnFrButtonCornerTlInactive*/
-    /* SP_QsnFrButtonCornerTrInactive */ {KAknsIIDQsnFrButtonTbCornerTr,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b2},
-    /* SP_QsnFrButtonCornerBlInactive */ {KAknsIIDQsnFrButtonTbCornerBl,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b3},
-    /* SP_QsnFrButtonCornerTrInactive */ {KAknsIIDQsnFrButtonTbCornerBr,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b4},
-    /* SP_QsnFrButtonSideTInactive */    {KAknsIIDQsnFrButtonTbSideT,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b5},
-    /* SP_QsnFrButtonSideBInactive */    {KAknsIIDQsnFrButtonTbSideB,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b6},
-    /* SP_QsnFrButtonSideLInactive */    {KAknsIIDQsnFrButtonTbSideL,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b7},
-    /* SP_QsnFrButtonSideRInactive */    {KAknsIIDQsnFrButtonTbSideR,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b8},
-    /* SP_QsnFrButtonCenterInactive */   {KAknsIIDQsnFrButtonTbCenter,          EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b9},
+    /* SP_QsnFrButtonCornerTlInactive */ {KAknsIIDQsnFrButtonTbCornerTl,        ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b1}, /*KAknsIIDQsnFrButtonCornerTlInactive*/
+    /* SP_QsnFrButtonCornerTrInactive */ {KAknsIIDQsnFrButtonTbCornerTr,        ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b2},
+    /* SP_QsnFrButtonCornerBlInactive */ {KAknsIIDQsnFrButtonTbCornerBl,        ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b3},
+    /* SP_QsnFrButtonCornerTrInactive */ {KAknsIIDQsnFrButtonTbCornerBr,        ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b4},
+    /* SP_QsnFrButtonSideTInactive */    {KAknsIIDQsnFrButtonTbSideT,           ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b5},
+    /* SP_QsnFrButtonSideBInactive */    {KAknsIIDQsnFrButtonTbSideB,           ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b6},
+    /* SP_QsnFrButtonSideLInactive */    {KAknsIIDQsnFrButtonTbSideL,           ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b7},
+    /* SP_QsnFrButtonSideRInactive */    {KAknsIIDQsnFrButtonTbSideR,           ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x21b8},
+    /* SP_QsnFrButtonCenterInactive */   {KAknsIIDQsnFrButtonTbCenter,          EDrawIcon,   ES60_3_X,    EAknsMajorSkin, 0x21b9},
 
 };
 
@@ -349,7 +360,7 @@ QPixmap QS60StyleModeSpecifics::skinnedGraphics(
 }
 
 QPixmap QS60StyleModeSpecifics::colorSkinnedGraphics(
-    const QS60StyleEnums::SkinParts &stylepart, const QSize &size, QPainter *painter, 
+    const QS60StyleEnums::SkinParts &stylepart, const QSize &size, QPainter *painter,
     QS60StylePrivate::SkinElementFlags flags)
 {
     QPixmap colorGraphics;
@@ -357,155 +368,121 @@ QPixmap QS60StyleModeSpecifics::colorSkinnedGraphics(
     return error ? QPixmap() : colorGraphics;
 }
 
-void QS60StyleModeSpecifics::fallbackInfo(const QS60StyleEnums::SkinParts &stylepart, TDes& fallbackFileName, TInt& fallbackIndex)
+void QS60StyleModeSpecifics::fallbackInfo(const QS60StyleEnums::SkinParts &stylePart, TInt &fallbackIndex)
 {
-    switch(stylepart) {
+    switch(stylePart) {
         case QS60StyleEnums::SP_QgnGrafBarWait:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_bar_wait_1;
             break;
         case QS60StyleEnums::SP_QgnGrafBarFrameCenter:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_bar_frame_center;
             break;
         case QS60StyleEnums::SP_QgnGrafBarFrameSideL:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_bar_frame_side_l;
             break;
         case QS60StyleEnums::SP_QgnGrafBarFrameSideR:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_bar_frame_side_r;
             break;
         case QS60StyleEnums::SP_QgnGrafBarProgress:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_bar_progress;
             break;
         case QS60StyleEnums::SP_QgnGrafTabActiveL:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_tab_active_l;
             break;
         case QS60StyleEnums::SP_QgnGrafTabActiveM:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_tab_active_m;
             break;
         case QS60StyleEnums::SP_QgnGrafTabActiveR:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_tab_active_r;
             break;
         case QS60StyleEnums::SP_QgnGrafTabPassiveL:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_tab_passive_l;
             break;
         case QS60StyleEnums::SP_QgnGrafTabPassiveM:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_tab_passive_m;
             break;
         case QS60StyleEnums::SP_QgnGrafTabPassiveR:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_graf_tab_passive_r;
             break;
         case QS60StyleEnums::SP_QgnIndiCheckboxOff:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_checkbox_off;
             break;
         case QS60StyleEnums::SP_QgnIndiCheckboxOn:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_checkbox_on;
             break;
         case QS60StyleEnums::SP_QgnIndiHlColSuper:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = 0x4456; /* EMbmAvkonQgn_indi_hl_col_super */
             break;
         case QS60StyleEnums::SP_QgnIndiHlExpSuper:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = 0x4458; /* EMbmAvkonQgn_indi_hl_exp_super */
             break;
         case QS60StyleEnums::SP_QgnIndiHlLineBranch:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = 0x445A; /* EMbmAvkonQgn_indi_hl_line_branch */
             break;
         case QS60StyleEnums::SP_QgnIndiHlLineEnd:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = 0x445C; /* EMbmAvkonQgn_indi_hl_line_end */
             break;
         case QS60StyleEnums::SP_QgnIndiHlLineStraight:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = 0x445E; /* EMbmAvkonQgn_indi_hl_line_straight */
             break;
         case QS60StyleEnums::SP_QgnIndiMarkedAdd:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_marked_add;
             break;
         case QS60StyleEnums::SP_QgnIndiNaviArrowLeft:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_navi_arrow_left;
             break;
         case QS60StyleEnums::SP_QgnIndiNaviArrowRight:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_navi_arrow_right;
             break;
         case QS60StyleEnums::SP_QgnIndiRadiobuttOff:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_radiobutt_off;
             break;
         case QS60StyleEnums::SP_QgnIndiRadiobuttOn:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_radiobutt_on;
             break;
-        case QS60StyleEnums::SP_QgnIndiSliderEdit:
-            fallbackFileName = KAvkonBitmapFile();
-            fallbackIndex = EMbmAvkonQgn_indi_slider_edit;
+        case QS60StyleEnums::SP_QgnGrafNsliderMarker:
+            fallbackIndex = 17572; /* EMbmAvkonQgn_graf_nslider_marker */
+            break;
+        case QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected:
+            fallbackIndex = 17574; /* EMbmAvkonQgn_graf_nslider_marker_selected */
             break;
         case QS60StyleEnums::SP_QgnIndiSubMenu:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_indi_submenu;
             break;
         case QS60StyleEnums::SP_QgnNoteErased:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_note_erased;
             break;
         case QS60StyleEnums::SP_QgnNoteError:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_note_error;
             break;
         case QS60StyleEnums::SP_QgnNoteInfo:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_note_info;
             break;
         case QS60StyleEnums::SP_QgnNoteOk:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_note_ok;
             break;
         case QS60StyleEnums::SP_QgnNoteQuery:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_note_query;
             break;
         case QS60StyleEnums::SP_QgnNoteWarning:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_note_warning;
             break;
         case QS60StyleEnums::SP_QgnPropFileSmall:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_prop_file_small;
             break;
         case QS60StyleEnums::SP_QgnPropFolderCurrent:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_prop_folder_current;
             break;
         case QS60StyleEnums::SP_QgnPropFolderSmall:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_prop_folder_small;
             break;
         case QS60StyleEnums::SP_QgnPropFolderSmallNew:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_prop_folder_small_new;
             break;
         case QS60StyleEnums::SP_QgnPropPhoneMemcLarge:
-            fallbackFileName = KAvkonBitmapFile();
             fallbackIndex = EMbmAvkonQgn_prop_phone_memc_large;
             break;
         default:
-            fallbackFileName = KNullDesC();
             fallbackIndex = -1;
             break;
     }
@@ -521,8 +498,7 @@ QPixmap QS60StyleModeSpecifics::colorSkinnedGraphicsLX(
 
     TInt fallbackGraphicID = -1;
     HBufC* iconFile = HBufC::NewLC( KMaxFileName );
-    TPtr fileNamePtr = iconFile->Des();
-    fallbackInfo(stylepart, fileNamePtr, fallbackGraphicID);
+    fallbackInfo(stylepart, fallbackGraphicID);
 
     TAknsItemID colorGroup = KAknsIIDQsnIconColors;
     TRgb defaultColor = KRgbBlack;
@@ -543,10 +519,18 @@ QPixmap QS60StyleModeSpecifics::colorSkinnedGraphicsLX(
         fallbackGraphicID == KErrNotFound?KErrNotFound:fallbackGraphicID+1; //masks are auto-generated as next in mif files
     MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
     AknsUtils::CreateColorIconLC(
-        skinInstance, skinId, colorGroup, colorIndex, icon, iconMask, fileNamePtr, fallbackGraphicID , fallbackGraphicsMaskID, defaultColor);
-    User::LeaveIfError(AknIconUtils::SetSize(icon, targetSize, EAspectRatioNotPreserved));
-    User::LeaveIfError(AknIconUtils::SetSize(iconMask, targetSize, EAspectRatioNotPreserved));
-    QPixmap result = fromFbsBitmap(icon, iconMask, flags, qt_TDisplayMode2Format(icon->DisplayMode()));
+        skinInstance,
+        skinId,
+        colorGroup,
+        colorIndex,
+        icon,
+        iconMask,
+        AknIconUtils::AvkonIconFileName(),
+        fallbackGraphicID,
+        fallbackGraphicsMaskID,
+        defaultColor);
+
+    QPixmap result = fromFbsBitmap(icon, iconMask, flags, targetSize);
     CleanupStack::PopAndDestroy(3); //icon, iconMask, iconFile
     return result;
 }
@@ -566,55 +550,43 @@ struct QAutoFbsBitmapHeapLock
     CFbsBitmap* mBmp;
 };
 
-QPixmap QS60StyleModeSpecifics::fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask, QS60StylePrivate::SkinElementFlags flags, QImage::Format format)
+QPixmap QS60StyleModeSpecifics::fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask, QS60StylePrivate::SkinElementFlags flags, const TSize &targetSize)
 {
     Q_ASSERT(icon);
-    const TSize iconSize = icon->SizeInPixels();
-    const int iconBytesPerLine = CFbsBitmap::ScanLineLength(iconSize.iWidth, icon->DisplayMode());
-    const int iconBytesCount = iconBytesPerLine * iconSize.iHeight;
 
-    QImage iconImage(qt_TSize2QSize(iconSize), format);
-    if (iconImage.isNull())
-        return QPixmap();
+    AknIconUtils::DisableCompression(icon);
+    TInt error = AknIconUtils::SetSize(icon, targetSize, EAspectRatioNotPreserved);
 
-    checkAndUnCompressBitmap(icon);
-    if (!icon) //checkAndUnCompressBitmap might set icon to NULL
+    if (mask && !error) {
+        AknIconUtils::DisableCompression(mask);
+        error = AknIconUtils::SetSize(mask, targetSize, EAspectRatioNotPreserved);
+    }
+    if (error)
         return QPixmap();
 
-    icon->LockHeap();
-    const uchar *const iconBytes = (uchar*)icon->DataAddress();
-    // The icon data needs to be copied, since the color format will be
-    // automatically converted to Format_ARGB32 when setAlphaChannel is called.
-    memcpy(iconImage.bits(), iconBytes, iconBytesCount);
-    icon->UnlockHeap();
-    if (mask) {
-        checkAndUnCompressBitmap(mask);
-        if (mask) { //checkAndUnCompressBitmap might set mask to NULL
-            const TSize maskSize = icon->SizeInPixels();
-            const int maskBytesPerLine = CFbsBitmap::ScanLineLength(maskSize.iWidth, mask->DisplayMode());
-            // heap lock object required because QImage ctor might throw
-            QAutoFbsBitmapHeapLock maskHeapLock(mask);
-            const uchar *const maskBytes = (uchar *)mask->DataAddress();
-            // Since no other bitmap should be locked, we can just "borrow" the mask data for setAlphaChannel
-            const QImage maskImage(maskBytes, maskSize.iWidth, maskSize.iHeight, maskBytesPerLine, QImage::Format_Indexed8);
-            if (!maskImage.isNull())
-                iconImage.setAlphaChannel(maskImage);
+    QPixmap pixmap = QPixmap::fromSymbianCFbsBitmap(icon);
+    if (mask)
+        pixmap.setAlphaChannel(QPixmap::fromSymbianCFbsBitmap(mask));
+
+    if ((flags & QS60StylePrivate::SF_PointEast) ||
+        (flags & QS60StylePrivate::SF_PointSouth) ||
+        (flags & QS60StylePrivate::SF_PointWest)) {
+        QImage iconImage = pixmap.toImage();
+        QTransform imageTransform;
+        if (flags & QS60StylePrivate::SF_PointEast) {
+            imageTransform.rotate(90);
+        } else if (flags & QS60StylePrivate::SF_PointSouth) {
+            imageTransform.rotate(180);
+            iconImage = iconImage.transformed(imageTransform);
+        } else if (flags & QS60StylePrivate::SF_PointWest) {
+            imageTransform.rotate(270);
         }
-    }
+        if (imageTransform.isRotating())
+            iconImage = iconImage.transformed(imageTransform);
 
-    QTransform imageTransform;
-    if (flags & QS60StylePrivate::SF_PointEast) {
-        imageTransform.rotate(90);
-    } else if (flags & QS60StylePrivate::SF_PointSouth) {
-        imageTransform.rotate(180);
-        iconImage = iconImage.transformed(imageTransform);
-    } else if (flags & QS60StylePrivate::SF_PointWest) {
-        imageTransform.rotate(270);
+        pixmap = QPixmap::fromImage(iconImage);
     }
-    if (imageTransform.isRotating())
-        iconImage = iconImage.transformed(imageTransform);
-
-    return QPixmap::fromImage(iconImage);
+    return pixmap;
 }
 
 bool QS60StylePrivate::isTouchSupported()
@@ -627,6 +599,11 @@ bool QS60StylePrivate::isToolBarBackground()
     return (QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || QSysInfo::s60Version() == QSysInfo::SV_S60_3_2);
 }
 
+bool QS60StylePrivate::hasSliderGrooveGraphic()
+{
+    return QSysInfo::s60Version() != QSysInfo::SV_S60_3_1;
+}
+
 QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
 {
     CCoeControl *control = targetWidget->effectiveWinId();
@@ -645,7 +622,7 @@ QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
 }
 
 QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
-    QS60StyleEnums::SkinParts part, const QSize &size, 
+    QS60StyleEnums::SkinParts part, const QSize &size,
     QS60StylePrivate::SkinElementFlags flags)
 {
     // this function can throw both exceptions and leaves. There are no cleanup dependencies between Qt and Symbian parts.
@@ -653,7 +630,7 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
         return QPixmap();
 
     // Check release support and change part, if necessary.
-    const TAknsItemID skinId = checkAndUpdateReleaseSpecificGraphics((int)part);
+    const TAknsItemID skinId = partSpecificThemeId((int)part);
     const int stylepartIndex = (int)part;
     const TDrawType drawType = m_partMap[stylepartIndex].drawType;
     Q_ASSERT(drawType != ENoDraw);
@@ -667,24 +644,34 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
     QPixmap result;
 
     switch (drawType) {
+        case EDrawGulIcon: {
+            CGulIcon* icon = AknsUtils::CreateGulIconL( AknsUtils::SkinInstance(), skinId, EFalse );
+            if (icon)
+                result = fromFbsBitmap(icon->Bitmap(), icon->Mask(), flags, targetSize);
+            delete icon;
+            break;
+        }
         case EDrawIcon: {
             TInt fallbackGraphicID = -1;
-            HBufC* iconFile = HBufC::NewLC( KMaxFileName );
-            TPtr fileNamePtr = iconFile->Des();
-            fallbackInfo(part, fileNamePtr, fallbackGraphicID);
-            // todo: could we instead use   AknIconUtils::AvkonIconFileName(); to avoid allocating each time?
+            fallbackInfo(part, fallbackGraphicID);
 
             CFbsBitmap *icon = 0;
             CFbsBitmap *iconMask = 0;
             const TInt fallbackGraphicsMaskID =
                 fallbackGraphicID == KErrNotFound?KErrNotFound:fallbackGraphicID+1; //masks are auto-generated as next in mif files
-    //        QS60WindowSurface::unlockBitmapHeap();
-            AknsUtils::CreateIconLC(skinInstance, skinId, icon, iconMask, fileNamePtr, fallbackGraphicID , fallbackGraphicsMaskID);
-            User::LeaveIfError(AknIconUtils::SetSize(icon, targetSize, EAspectRatioNotPreserved));
-            User::LeaveIfError(AknIconUtils::SetSize(iconMask, targetSize, EAspectRatioNotPreserved));
-            result = fromFbsBitmap(icon, iconMask, flags, qt_TDisplayMode2Format(icon->DisplayMode()));
-            CleanupStack::PopAndDestroy(3); // iconMask, icon, iconFile
-    //        QS60WindowSurface::lockBitmapHeap();
+
+            AknsUtils::CreateIconL(
+                skinInstance,
+                skinId,
+                icon,
+                iconMask,
+                AknIconUtils::AvkonIconFileName(),
+                fallbackGraphicID ,
+                fallbackGraphicsMaskID);
+
+            result = fromFbsBitmap(icon, iconMask, flags, targetSize);
+            delete icon;
+            delete iconMask;
             break;
         }
         case EDrawBackground: {
@@ -715,13 +702,16 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
                 KAknsDrawParamDefault | KAknsDrawParamRGBOnly);
 
             if (drawn)
-                result = fromFbsBitmap(background, NULL, flags, QImage::Format_RGB32);
+                result = fromFbsBitmap(background, NULL, flags, targetSize);
+            // if drawing fails in skin server, just ignore the background (probably OOM occured)
 
             CleanupStack::PopAndDestroy(4, background); //background, dev, gc, bgContext
     //        QS60WindowSurface::lockBitmapHeap();
             break;
         }
     }
+    if (!result)
+        result = QPixmap();
 
     return result;
 }
@@ -755,24 +745,46 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(QS60StylePrivate::SkinFr
     User::LeaveIfError(bitmapDev->CreateContext(bitmapGc));
     CleanupStack::PushL(bitmapGc);
 
+#ifndef Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
     frame->LockHeap();
     memset(frame->DataAddress(), 0, frame->SizeInPixels().iWidth * frame->SizeInPixels().iHeight * 4);  // 4: argb bytes
     frame->UnlockHeap();
+#endif
 
     const TRect outerRect(TPoint(0, 0), targetSize);
     const TRect innerRect = innerRectFromElement(frameElement, outerRect);
 
     TAknsItemID frameSkinID, centerSkinID;
-    frameSkinID = centerSkinID = checkAndUpdateReleaseSpecificGraphics(QS60StylePrivate::m_frameElementsData[frameElement].center);
+    frameSkinID = centerSkinID = partSpecificThemeId(QS60StylePrivate::m_frameElementsData[frameElement].center);
     frameIdAndCenterId(frameElement, frameSkinID, centerSkinID);
-    const TBool drawn = AknsDrawUtils::DrawFrame( skinInstance,
-                           *bitmapGc, outerRect, innerRect,
-                           frameSkinID, centerSkinID,
-                           drawParam );
+
+    TBool drawn = AknsDrawUtils::DrawFrame(
+        skinInstance,
+        *bitmapGc,
+        outerRect,
+        innerRect,
+        frameSkinID,
+        centerSkinID,
+        drawParam );
 
     if (S60->supportsPremultipliedAlpha) {
-        if (drawn)
-            result = fromFbsBitmap(frame, NULL, flags, QImage::Format_ARGB32_Premultiplied);
+        if (drawn) {
+            result = fromFbsBitmap(frame, NULL, flags, targetSize);
+        } else {
+            // Drawing might fail due to OOM (we can do nothing about that),
+            // or due to skin item not being available.
+            // If the latter occurs, lets try switch to non-release specific items (if available)
+            // and re-try the drawing.
+            frameSkinID = centerSkinID = m_partMap[(int)QS60StylePrivate::m_frameElementsData[frameElement].center].skinID;
+            frameIdAndCenterId(frameElement, frameSkinID, centerSkinID);
+            drawn = AknsDrawUtils::DrawFrame( skinInstance,
+                                   *bitmapGc, outerRect, innerRect,
+                                   frameSkinID, centerSkinID,
+                                   drawParam );
+            // in case drawing fails, even after using default graphics, ignore the error
+            if (drawn)
+                result = fromFbsBitmap(frame, NULL, flags, targetSize);
+        }
     } else {
         TDisplayMode maskDepth = EGray2;
         // Query the skin item for possible frame graphics mask details.
@@ -802,11 +814,12 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(QS60StylePrivate::SkinFr
                 maskBitGc->Clear();
                 maskBitGc->SetBrushStyle(CGraphicsContext::ENullBrush);
 
-                AknsDrawUtils::DrawFrame(skinInstance,
+                drawn = AknsDrawUtils::DrawFrame(skinInstance,
                                            *maskBitGc, outerRect, innerRect,
                                            frameSkinID, centerSkinID,
                                            KAknsSDMAlphaOnly |KAknsDrawParamNoClearUnderImage);
-                result = fromFbsBitmap(frame, frameMask, flags, QImage::Format_ARGB32);
+                if (drawn)
+                    result = fromFbsBitmap(frame, frameMask, flags, targetSize);
             }
             CleanupStack::PopAndDestroy(3, frameMask);
         }
@@ -880,10 +893,12 @@ bool QS60StyleModeSpecifics::checkSupport(const int supportedRelease)
     const QSysInfo::S60Version currentRelease = QSysInfo::s60Version();
     return ( (currentRelease == QSysInfo::SV_S60_3_1 && supportedRelease & ES60_3_1) ||
              (currentRelease == QSysInfo::SV_S60_3_2 && supportedRelease & ES60_3_2) ||
-             (currentRelease == QSysInfo::SV_S60_5_0 && supportedRelease & ES60_5_0));
+             (currentRelease == QSysInfo::SV_S60_5_0 && supportedRelease & ES60_5_0) ||
+             (currentRelease == QSysInfo::SV_S60_5_1 && supportedRelease & ES60_5_1) ||
+             (currentRelease == QSysInfo::SV_S60_5_2 && supportedRelease & ES60_5_2));
 }
 
-TAknsItemID QS60StyleModeSpecifics::checkAndUpdateReleaseSpecificGraphics(int part)
+TAknsItemID QS60StyleModeSpecifics::partSpecificThemeId(int part)
 {
     TAknsItemID newSkinId;
     if (!checkSupport(m_partMap[(int)part].supportInfo))
@@ -893,33 +908,6 @@ TAknsItemID QS60StyleModeSpecifics::checkAndUpdateReleaseSpecificGraphics(int pa
     return newSkinId;
 }
 
-void QS60StyleModeSpecifics::checkAndUnCompressBitmap(CFbsBitmap*& aOriginalBitmap)
-{
-    TRAPD(error, checkAndUnCompressBitmapL(aOriginalBitmap));
-    if (error)
-        aOriginalBitmap = NULL;
-}
-
-void QS60StyleModeSpecifics::checkAndUnCompressBitmapL(CFbsBitmap*& aOriginalBitmap)
-{
-    const TSize iconSize = aOriginalBitmap->SizeInPixels();
-    const int iconBytesPerLine = CFbsBitmap::ScanLineLength(iconSize.iWidth, aOriginalBitmap->DisplayMode());
-    const int iconBytesCount = iconBytesPerLine * iconSize.iHeight;
-    if (aOriginalBitmap->IsCompressedInRAM() || aOriginalBitmap->Header().iBitmapSize < iconBytesCount) {
-        const TSize iconSize(aOriginalBitmap->SizeInPixels().iWidth,
-            aOriginalBitmap->SizeInPixels().iHeight);
-        CFbsBitmap* uncompressedBitmap = new (ELeave) CFbsBitmap();
-        CleanupStack::PushL(uncompressedBitmap);
-        User::LeaveIfError(uncompressedBitmap->Create(iconSize,
-            aOriginalBitmap->DisplayMode()));
-        unCompressBitmapL(iconSize, uncompressedBitmap, aOriginalBitmap);
-        CleanupStack::Pop(uncompressedBitmap);
-        User::LeaveIfError(aOriginalBitmap->Duplicate(
-            uncompressedBitmap->Handle()));
-        delete uncompressedBitmap;
-    }
-}
-
 QFont QS60StylePrivate::s60Font_specific(
     QS60StyleEnums::FontCategories fontCategory, int pointSize)
 {
@@ -972,37 +960,23 @@ void QS60StylePrivate::setActiveLayout()
 {
     const QSize activeScreenSize(screenSize());
     int activeLayoutIndex = -1;
-    const bool mirrored = !QApplication::isLeftToRight();
     const short screenHeight = (short)activeScreenSize.height();
     const short screenWidth = (short)activeScreenSize.width();
     for (int i=0; i<m_numberOfLayouts; i++) {
         if (screenHeight==m_layoutHeaders[i].height &&
-            screenWidth==m_layoutHeaders[i].width &&
-            mirrored==m_layoutHeaders[i].mirroring) {
+            screenWidth==m_layoutHeaders[i].width) {
             activeLayoutIndex = i;
             break;
         }
     }
 
-    //not found, lets try without mirroring info
-    if (activeLayoutIndex==-1){
-        for (int i=0; i<m_numberOfLayouts; i++) {
-            if (screenHeight==m_layoutHeaders[i].height &&
-                screenWidth==m_layoutHeaders[i].width) {
-                activeLayoutIndex = i;
-                break;
-            }
-        }
-    }
-
     //not found, lets try with either of dimensions
     if (activeLayoutIndex==-1){
         const QSysInfo::S60Version currentRelease = QSysInfo::s60Version();
         const bool landscape = screenHeight < screenWidth;
 
-        activeLayoutIndex = (currentRelease == QSysInfo::SV_S60_3_1 || currentRelease == QSysInfo::SV_S60_3_2) ? 0 : 4;
-        activeLayoutIndex += (!landscape) ? 2 : 0;
-        activeLayoutIndex += (!mirrored) ? 1 : 0;
+        activeLayoutIndex = (currentRelease == QSysInfo::SV_S60_3_1 || currentRelease == QSysInfo::SV_S60_3_2) ? 0 : 2;
+        activeLayoutIndex += (!landscape) ? 1 : 0;
     }
 
     m_pmPointer = data[activeLayoutIndex];
@@ -1167,148 +1141,6 @@ QPixmap QS60StylePrivate::backgroundTexture()
     return *m_background;
 }
 
-// If the public SDK returns compressed images, please let us also uncompress those!
-void QS60StyleModeSpecifics::unCompressBitmapL(const TRect& aTrgRect, CFbsBitmap* aTrgBitmap, CFbsBitmap* aSrcBitmap)
-{
-    if (!aSrcBitmap)
-        User::Leave(KErrArgument);
-    if (!aTrgBitmap)
-        User::Leave(KErrArgument);
-
-   // Note! aSrcBitmap->IsCompressedInRAM() is always ETrue, since this method is called only if that applies!
-   // Extra note! this function is also being used when bitmaps appear to be compressed (because DataSize is too small)
-   // even when they pretend they are not. Assert removed.
-//   ASSERT(aSrcBitmap->IsCompressedInRAM());
-
-    TDisplayMode displayMode = aSrcBitmap->DisplayMode();
-
-    if (displayMode != aTrgBitmap->DisplayMode())
-        User::Leave(KErrArgument);
-
-    const TSize trgSize = aTrgBitmap->SizeInPixels();
-    const TSize srcSize = aSrcBitmap->SizeInPixels();
-
-    // calculate the valid drawing area
-    TRect drawRect = aTrgRect;
-    drawRect.Intersection(TRect(TPoint(0, 0), trgSize));
-
-    if (drawRect.IsEmpty())
-        return;
-
-    CFbsBitmap* realSource = new (ELeave) CFbsBitmap();
-    CleanupStack::PushL(realSource);
-    User::LeaveIfError(realSource->Create(srcSize, displayMode));
-    CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL(realSource);
-    CleanupStack::PushL(dev);
-    CFbsBitGc* gc = NULL;
-    User::LeaveIfError(dev->CreateContext(gc));
-    CleanupStack::PushL(gc);
-    gc->BitBlt(TPoint(0, 0), aSrcBitmap);
-    CleanupStack::PopAndDestroy(2); // dev, gc
-
-    // Heap lock for FBServ large chunk is only needed with large bitmaps.
-    if (realSource->IsLargeBitmap() || aTrgBitmap->IsLargeBitmap()) {
-        aTrgBitmap->LockHeapLC(ETrue); // fbsheaplock
-    } else {
-        CleanupStack::PushL((TAny*) NULL);
-    }
-
-    TUint32* srcAddress = realSource->DataAddress();
-    TUint32* trgAddress = aTrgBitmap->DataAddress();
-
-    const TInt xSkip = (srcSize.iWidth << 8) / aTrgRect.Width();
-    const TInt ySkip = (srcSize.iHeight << 8) / aTrgRect.Height();
-
-    const TInt drawWidth = drawRect.Width();
-    const TInt drawHeight = drawRect.Height();
-
-    const TRect offsetRect(aTrgRect.iTl, drawRect.iTl);
-    const TInt yPosOffset = ySkip * offsetRect.Height();
-    const TInt xPosOffset = xSkip * offsetRect.Width();
-
-    if ((displayMode == EGray256) || (displayMode == EColor256)) {
-        const TInt srcScanLen8 = CFbsBitmap::ScanLineLength(srcSize.iWidth,
-            displayMode);
-        const TInt trgScanLen8 = CFbsBitmap::ScanLineLength(trgSize.iWidth,
-            displayMode);
-
-        TUint8* trgAddress8 = reinterpret_cast<TUint8*> (trgAddress);
-
-        TInt yPos = yPosOffset;
-        // skip left and top margins in the beginning
-        trgAddress8 += trgScanLen8 * drawRect.iTl.iY + drawRect.iTl.iX;
-
-        for (TInt y = 0; y < drawHeight; y++) {
-            const TUint8* srcAddress8 = reinterpret_cast<const TUint8*> (srcAddress)
-                + (srcScanLen8 * (yPos >> 8));
-
-            TInt xPos = xPosOffset;
-            for (TInt x = 0; x < drawWidth; x++) {
-                *(trgAddress8++) = srcAddress8[xPos >> 8];
-                xPos += xSkip;
-            }
-
-            yPos += ySkip;
-
-            trgAddress8 += trgScanLen8 - drawWidth;
-        }
-    } else if (displayMode == EColor4K || displayMode == EColor64K) {
-        const TInt srcScanLen16 = CFbsBitmap::ScanLineLength(srcSize.iWidth,
-            displayMode) >>1;
-        const TInt trgScanLen16 = CFbsBitmap::ScanLineLength(trgSize.iWidth,
-            displayMode) >>1;
-
-        TUint16* trgAddress16 = reinterpret_cast<TUint16*> (trgAddress);
-
-        TInt yPos = yPosOffset;
-        // skip left and top margins in the beginning
-        trgAddress16 += trgScanLen16 * drawRect.iTl.iY + drawRect.iTl.iX;
-
-        for (TInt y = 0; y < drawHeight; y++) {
-            const TUint16* srcAddress16 = reinterpret_cast<const TUint16*> (srcAddress)
-                + (srcScanLen16 * (yPos >> 8));
-
-            TInt xPos = xPosOffset;
-            for (TInt x = 0; x < drawWidth; x++) {
-                *(trgAddress16++) = srcAddress16[xPos >> 8];
-                xPos += xSkip;
-            }
-
-            yPos += ySkip;
-
-            trgAddress16 += trgScanLen16 - drawWidth;
-        }
-    } else if (displayMode == EColor16MU || displayMode == EColor16MA) {
-        const TInt srcScanLen32 = CFbsBitmap::ScanLineLength(srcSize.iWidth,
-            displayMode) >>2;
-        const TInt trgScanLen32 = CFbsBitmap::ScanLineLength(trgSize.iWidth,
-            displayMode) >>2;
-
-        TUint32* trgAddress32 = reinterpret_cast<TUint32*> (trgAddress);
-
-        TInt yPos = yPosOffset;
-        // skip left and top margins in the beginning
-        trgAddress32 += trgScanLen32 * drawRect.iTl.iY + drawRect.iTl.iX;
-
-        for (TInt y = 0; y < drawHeight; y++) {
-            const TUint32* srcAddress32 = reinterpret_cast<const TUint32*> (srcAddress)
-                + (srcScanLen32 * (yPos >> 8));
-
-            TInt xPos = xPosOffset;
-            for (TInt x = 0; x < drawWidth; x++) {
-                *(trgAddress32++) = srcAddress32[xPos >> 8];
-                xPos += xSkip;
-            }
-
-            yPos += ySkip;
-
-            trgAddress32 += trgScanLen32 - drawWidth;
-        }
-    } else { User::Leave(KErrUnknown);}
-
-    CleanupStack::PopAndDestroy(2); // fbsheaplock, realSource
-}
-
 QSize QS60StylePrivate::screenSize()
 {
     const TSize screenSize = QS60Data::screenDevice()->SizeInPixels();
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index 55d57718f1..e49854fdf0 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -337,6 +337,11 @@ bool QS60StylePrivate::isToolBarBackground()
     return true;
 }
 
+bool QS60StylePrivate::hasSliderGrooveGraphic()
+{
+    return false;
+}
+
 QFont QS60StylePrivate::s60Font_specific(QS60StyleEnums::FontCategories fontCategory, int pointSize)
 {
     QFont result;
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index af30f1546e..f5af960bfa 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -154,7 +154,7 @@ qreal angle(const QPointF &p1, const QPointF &p2)
         }
 
         qreal m = -(y2 - y1) / (x2 - x1);
-        _angle = atan(m) *  rad_factor;
+        _angle = qAtan(m) *  rad_factor;
 
         if (p1.x() < p2.x())
             _angle = 180 - _angle;
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index 88a2cce609..7e5c55ac5c 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -168,7 +168,7 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) {
 	SOURCES += styles/qs60style.cpp
 	symbian {
 		SOURCES += styles/qs60style_s60.cpp
-		LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
+		LIBS += -laknicon -laknskins -laknskinsrv -lfontutils -legul
 	} else {
 		SOURCES += styles/qs60style_simulated.cpp
 		RESOURCES += styles/qstyle_s60_simulated.qrc
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 27fc3c18a7..d364025449 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -185,22 +185,11 @@ QFontEngine::QFontEngine()
 
 QFontEngine::~QFontEngine()
 {
-    for (GlyphPointerHash::const_iterator it = m_glyphPointerHash.constBegin(),
-            end = m_glyphPointerHash.constEnd(); it != end; ++it) {
-        for (QList<QFontEngineGlyphCache*>::const_iterator it2 = it.value().constBegin(),
-                end2 = it.value().constEnd(); it2 != end2; ++it2) {
-            delete *it2;
-        }
-    }
-    m_glyphPointerHash.clear();
-    for (GlyphIntHash::const_iterator it = m_glyphIntHash.constBegin(),
-            end = m_glyphIntHash.constEnd(); it != end; ++it) {
-        for (QList<QFontEngineGlyphCache*>::const_iterator it2 = it.value().constBegin(),
-                end2 = it.value().constEnd(); it2 != end2; ++it2) {
-            delete *it2;
-        }
+    for (QLinkedList<GlyphCacheEntry>::const_iterator it = m_glyphCaches.constBegin(),
+            end = m_glyphCaches.constEnd(); it != end; ++it) {
+        delete it->cache;
     }
-    m_glyphIntHash.clear();
+    m_glyphCaches.clear();
     qHBFreeFace(hbFace);
 }
 
@@ -713,103 +702,30 @@ QByteArray QFontEngine::getSfntTable(uint tag) const
     return table;
 }
 
-void QFontEngine::expireGlyphCache()
-{
-    if (m_glyphCacheQueue.count() > 10) { // hold only 10 caches in memory.
-        QFontEngineGlyphCache *old = m_glyphCacheQueue.takeFirst();
-        // remove the value from either of our hashes
-        for (GlyphPointerHash::iterator i = m_glyphPointerHash.begin(); i != m_glyphPointerHash.end(); ++i) {
-            QList<QFontEngineGlyphCache *> list = i.value();
-            if (list.removeAll(old)) {
-                if (list.isEmpty())
-                    m_glyphPointerHash.remove(i.key());
-                else
-                    m_glyphPointerHash.insert(i.key(), list);
-                break;
-            }
-        }
-        for (GlyphIntHash::iterator i = m_glyphIntHash.begin(); i != m_glyphIntHash.end(); ++i) {
-            QList<QFontEngineGlyphCache *> list = i.value();
-            if (list.removeAll(old)) {
-                if (list.isEmpty())
-                    m_glyphIntHash.remove(i.key());
-                else
-                    m_glyphIntHash.insert(i.key(), list);
-                break;
-            }
-        }
-        delete old;
-    }
-}
-
 void QFontEngine::setGlyphCache(void *key, QFontEngineGlyphCache *data)
 {
     Q_ASSERT(data);
-    QList<QFontEngineGlyphCache*> items = m_glyphPointerHash.value(key);
-
-    for (QList<QFontEngineGlyphCache*>::iterator it = items.begin(), end = items.end(); it != end; ++it) {
-        QFontEngineGlyphCache *c = *it;
-        if (qtransform_equals_no_translate(c->m_transform, data->m_transform)) {
-            if (c == data)
-                return;
-            items.removeAll(c);
-            delete c;
-            break;
-        }
-    }
-    items.append(data);
-    m_glyphPointerHash.insert(key, items);
 
-    m_glyphCacheQueue.append(data);
-    expireGlyphCache();
-}
+    GlyphCacheEntry entry = { key, data };
+    if (m_glyphCaches.contains(entry))
+        return;
 
-void QFontEngine::setGlyphCache(QFontEngineGlyphCache::Type key, QFontEngineGlyphCache *data)
-{
-    Q_ASSERT(data);
-    QList<QFontEngineGlyphCache*> items = m_glyphIntHash.value(key);
-
-    for (QList<QFontEngineGlyphCache*>::iterator it = items.begin(), end = items.end(); it != end; ++it) {
-        QFontEngineGlyphCache *c = *it;
-        if (qtransform_equals_no_translate(c->m_transform, data->m_transform)) {
-            if (c == data)
-                return;
-            items.removeAll(c);
-            delete c;
-            break;
-        }
-    }
-    items.append(data);
-    m_glyphIntHash.insert(key, items);
+    // Limit the glyph caches to 4. This covers all 90 degree rotations and limits
+    // memory use when there is continous or random rotation
+    if (m_glyphCaches.size() == 4)
+        delete m_glyphCaches.takeLast().cache;
 
-    m_glyphCacheQueue.append(data);
-    expireGlyphCache();
-}
+    m_glyphCaches.push_front(entry);
 
-QFontEngineGlyphCache *QFontEngine::glyphCache(void *key, const QTransform &transform) const
-{
-    QList<QFontEngineGlyphCache*> items = m_glyphPointerHash.value(key);
-
-    for (QList<QFontEngineGlyphCache*>::iterator it = items.begin(), end = items.end(); it != end; ++it) {
-        QFontEngineGlyphCache *c = *it;
-        if (qtransform_equals_no_translate(c->m_transform, transform)) {
-            m_glyphCacheQueue.removeAll(c); // last used, move it up
-            m_glyphCacheQueue.append(c);
-            return c;
-        }
-    }
-    return 0;
 }
 
-QFontEngineGlyphCache *QFontEngine::glyphCache(QFontEngineGlyphCache::Type key, const QTransform &transform) const
+QFontEngineGlyphCache *QFontEngine::glyphCache(void *key, QFontEngineGlyphCache::Type type, const QTransform &transform) const
 {
-    QList<QFontEngineGlyphCache*> items = m_glyphIntHash.value(key);
-
-    for (QList<QFontEngineGlyphCache*>::iterator it = items.begin(), end = items.end(); it != end; ++it) {
-        QFontEngineGlyphCache *c = *it;
-        if (qtransform_equals_no_translate(c->m_transform, transform)) {
-            m_glyphCacheQueue.removeAll(c); // last used, move it up
-            m_glyphCacheQueue.append(c);
+    for (QLinkedList<GlyphCacheEntry>::const_iterator it = m_glyphCaches.constBegin(), end = m_glyphCaches.constEnd(); it != end; ++it) {
+        QFontEngineGlyphCache *c = it->cache;
+        if (key == it->context
+            && type == c->cacheType()
+            && qtransform_equals_no_translate(c->m_transform, transform)) {
             return c;
         }
     }
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm
index a4e7c04568..a75d70f82d 100644
--- a/src/gui/text/qfontengine_mac.mm
+++ b/src/gui/text/qfontengine_mac.mm
@@ -404,7 +404,9 @@ QFixed QCoreTextFontEngine::ascent() const
 }
 QFixed QCoreTextFontEngine::descent() const
 {
-    return QFixed::fromReal(CTFontGetDescent(ctfont)).ceil();
+    // subtract a pixel to even out the historical +1 in QFontMetrics::height().
+    // Fix in Qt 5.
+    return QFixed::fromReal(CTFontGetDescent(ctfont)).ceil() - 1;
 }
 QFixed QCoreTextFontEngine::leading() const
 {
@@ -1406,7 +1408,9 @@ QFixed QFontEngineMac::ascent() const
 
 QFixed QFontEngineMac::descent() const
 {
-    return m_descent;
+    // subtract a pixel to even out the historical +1 in QFontMetrics::height().
+    // Fix in Qt 5.
+    return m_descent - 1;
 }
 
 QFixed QFontEngineMac::leading() const
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 728c344b52..a9883b4af7 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -56,6 +56,7 @@
 #include "QtCore/qglobal.h"
 #include "QtCore/qatomic.h"
 #include <QtCore/qvarlengtharray.h>
+#include <QtCore/QLinkedList>
 #include "private/qtextengine_p.h"
 #include "private/qfont_p.h"
 
@@ -219,9 +220,7 @@ public:
     virtual HB_Error getPointInOutline(HB_Glyph glyph, int flags, hb_uint32 point, HB_Fixed *xpos, HB_Fixed *ypos, hb_uint32 *nPoints);
 
     void setGlyphCache(void *key, QFontEngineGlyphCache *data);
-    void setGlyphCache(QFontEngineGlyphCache::Type key, QFontEngineGlyphCache *data);
-    QFontEngineGlyphCache *glyphCache(void *key, const QTransform &transform) const;
-    QFontEngineGlyphCache *glyphCache(QFontEngineGlyphCache::Type key, const QTransform &transform) const;
+    QFontEngineGlyphCache *glyphCache(void *key, QFontEngineGlyphCache::Type type, const QTransform &transform) const;
 
     static const uchar *getCMap(const uchar *table, uint tableSize, bool *isSymbolFont, int *cmapSize);
     static quint32 getTrueTypeGlyphIndex(const uchar *cmap, uint unicode);
@@ -254,12 +253,13 @@ protected:
     static const QVector<QRgb> &grayPalette();
 
 private:
-    /// remove old entries from the glyph cache. Helper method for the setGlyphCache ones.
-    void expireGlyphCache();
+    struct GlyphCacheEntry {
+        void *context;
+        QFontEngineGlyphCache *cache;
+        bool operator==(const GlyphCacheEntry &other) { return context == other.context && cache == other.cache; }
+    };
 
-    GlyphPointerHash m_glyphPointerHash;
-    GlyphIntHash m_glyphIntHash;
-    mutable QList<QFontEngineGlyphCache*> m_glyphCacheQueue;
+    mutable QLinkedList<GlyphCacheEntry> m_glyphCaches;
 };
 
 inline bool operator ==(const QFontEngine::FaceId &f1, const QFontEngine::FaceId &f2)
diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h
index e04f4ac753..c6112baa03 100644
--- a/src/gui/text/qfontengineglyphcache_p.h
+++ b/src/gui/text/qfontengineglyphcache_p.h
@@ -75,17 +75,20 @@ QT_BEGIN_NAMESPACE
 class QFontEngineGlyphCache
 {
 public:
-    QFontEngineGlyphCache(const QTransform &matrix) : m_transform(matrix) { }
-
     enum Type {
         Raster_RGBMask,
         Raster_A8,
         Raster_Mono
     };
 
+    QFontEngineGlyphCache(const QTransform &matrix, Type type) : m_transform(matrix), m_type(type) { }
+
     virtual ~QFontEngineGlyphCache() { }
 
+    Type cacheType() const { return m_type; }
+
     QTransform m_transform;
+    QFontEngineGlyphCache::Type m_type;
 };
 typedef QHash<void *, QList<QFontEngineGlyphCache *> > GlyphPointerHash;
 typedef QHash<int, QList<QFontEngineGlyphCache *> > GlyphIntHash;
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp
index a18af4f0c6..c036c32f72 100644
--- a/src/gui/widgets/qabstractspinbox.cpp
+++ b/src/gui/widgets/qabstractspinbox.cpp
@@ -65,6 +65,11 @@
 #include <limits.h>
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+#include <W32STD.H>
+#include <private/qt_s60_p.h>
+#endif
+
 //#define QABSTRACTSPINBOX_QSBDEBUG
 #ifdef QABSTRACTSPINBOX_QSBDEBUG
 #  define QASBDEBUG qDebug
@@ -939,10 +944,12 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
         d->edit->setCursorPosition(d->prefix.size());
 
     int steps = 1;
+    bool isPgUpOrDown = false;
     switch (event->key()) {
     case Qt::Key_PageUp:
     case Qt::Key_PageDown:
         steps *= 10;
+        isPgUpOrDown = true;
     case Qt::Key_Up:
     case Qt::Key_Down: {
 #ifdef QT_KEYPAD_NAVIGATION
@@ -964,7 +971,13 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
         if (style()->styleHint(QStyle::SH_SpinBox_AnimateButton, 0, this)) {
             d->buttonState = (Keyboard | (up ? Up : Down));
         }
-        stepBy(steps);
+        if (d->spinClickTimerId == -1)
+            stepBy(steps);
+        if(event->isAutoRepeat() && !isPgUpOrDown) {
+            if(d->spinClickThresholdTimerId == -1 && d->spinClickTimerId == -1) {
+                d->updateState(up, true);
+            }
+        }
 #ifndef QT_NO_ACCESSIBILITY
         QAccessible::updateAccessibility(this, 0, QAccessible::ValueChanged);
 #endif
@@ -1061,8 +1074,7 @@ void QAbstractSpinBox::keyReleaseEvent(QKeyEvent *event)
 {
     Q_D(QAbstractSpinBox);
 
-    if (d->buttonState & Keyboard && !event->isAutoRepeat()
-        && style()->styleHint(QStyle::SH_SpinBox_AnimateButton, 0, this)) {
+    if (d->buttonState & Keyboard && !event->isAutoRepeat())  {
         d->reset();
     } else {
         d->edit->event(event);
@@ -1148,6 +1160,36 @@ void QAbstractSpinBox::hideEvent(QHideEvent *event)
     QWidget::hideEvent(event);
 }
 
+
+/*!
+    \internal
+
+    Used when acceleration is turned on. We need to get the
+    keyboard auto repeat rate from OS. This value is used as
+    argument when starting acceleration related timers.
+
+    Every platform should, either, use native calls to obtain
+    the value or hard code some reasonable rate.
+
+    Remember that time value should be given in msecs.
+*/
+static int getKeyboardAutoRepeatRate() {
+    int ret = 30;
+#if defined(Q_OS_SYMBIAN)
+    TTimeIntervalMicroSeconds32 initialTime;
+    TTimeIntervalMicroSeconds32 time;
+    S60->wsSession().GetKeyboardRepeatRate(initialTime, time);
+    ret = time.Int() / 1000; // msecs
+#elif defined(Q_OS_WIN)
+    DWORD time;
+    if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &time, 0) != FALSE)
+        ret = static_cast<int>(1000 / static_cast<int>(time)); // msecs
+#else
+#pragma message("Using default guesstimated value for keyboard repeat rate")
+#endif
+    return ret; // msecs
+}
+
 /*!
     \reimp
 */
@@ -1160,14 +1202,17 @@ void QAbstractSpinBox::timerEvent(QTimerEvent *event)
     if (event->timerId() == d->spinClickThresholdTimerId) {
         killTimer(d->spinClickThresholdTimerId);
         d->spinClickThresholdTimerId = -1;
-        d->spinClickTimerId = startTimer(d->spinClickTimerInterval);
+        d->effectiveSpinRepeatRate = d->buttonState & Keyboard
+                                     ? getKeyboardAutoRepeatRate()
+                                     : d->spinClickTimerInterval;
+        d->spinClickTimerId = startTimer(d->effectiveSpinRepeatRate);
         doStep = true;
     } else if (event->timerId() == d->spinClickTimerId) {
         if (d->accelerate) {
-            d->acceleration = d->acceleration + (int)(d->spinClickTimerInterval * 0.05);
-            if (d->spinClickTimerInterval - d->acceleration >= 10) {
+            d->acceleration = d->acceleration + (int)(d->effectiveSpinRepeatRate * 0.05);
+            if (d->effectiveSpinRepeatRate - d->acceleration >= 10) {
                 killTimer(d->spinClickTimerId);
-                d->spinClickTimerId = startTimer(d->spinClickTimerInterval - d->acceleration);
+                d->spinClickTimerId = startTimer(d->effectiveSpinRepeatRate - d->acceleration);
             }
         }
         doStep = true;
@@ -1308,8 +1353,8 @@ void QAbstractSpinBox::mouseReleaseEvent(QMouseEvent *event)
 QAbstractSpinBoxPrivate::QAbstractSpinBoxPrivate()
     : edit(0), type(QVariant::Invalid), spinClickTimerId(-1),
       spinClickTimerInterval(100), spinClickThresholdTimerId(-1), spinClickThresholdTimerInterval(-1),
-      buttonState(None), cachedText(QLatin1String("\x01")), cachedState(QValidator::Invalid),
-      pendingEmit(false), readOnly(false), wrapping(false),
+      effectiveSpinRepeatRate(1), buttonState(None), cachedText(QLatin1String("\x01")),
+      cachedState(QValidator::Invalid), pendingEmit(false), readOnly(false), wrapping(false),
       ignoreCursorPositionChanged(false), frame(true), accelerate(false), keyboardTracking(true),
       cleared(false), ignoreUpdateEdit(false), correctionMode(QAbstractSpinBox::CorrectToPreviousValue),
       acceleration(0), hoverControl(QStyle::SC_None), buttonSymbols(QAbstractSpinBox::UpDownArrows), validator(0)
@@ -1554,7 +1599,7 @@ void QAbstractSpinBoxPrivate::reset()
     Updates the state of the spinbox.
 */
 
-void QAbstractSpinBoxPrivate::updateState(bool up)
+void QAbstractSpinBoxPrivate::updateState(bool up, bool fromKeyboard /* = false */)
 {
     Q_Q(QAbstractSpinBox);
     if ((up && (buttonState & Up)) || (!up && (buttonState & Down)))
@@ -1563,7 +1608,7 @@ void QAbstractSpinBoxPrivate::updateState(bool up)
     if (q && (q->stepEnabled() & (up ? QAbstractSpinBox::StepUpEnabled
                                   : QAbstractSpinBox::StepDownEnabled))) {
         spinClickThresholdTimerId = q->startTimer(spinClickThresholdTimerInterval);
-        buttonState = (up ? (Mouse | Up) : (Mouse | Down));
+        buttonState = (up ? Up : Down) | (fromKeyboard ? Keyboard : Mouse);
         q->stepBy(up ? 1 : -1);
 #ifndef QT_NO_ACCESSIBILITY
         QAccessible::updateAccessibility(q, 0, QAccessible::ValueChanged);
@@ -1856,8 +1901,10 @@ QValidator::State QSpinBoxValidator::validate(QString &input, int &pos) const
     if (dptr->specialValueText.size() > 0 && input == dptr->specialValueText)
         return QValidator::Acceptable;
 
-    if (!dptr->prefix.isEmpty() && !input.startsWith(dptr->prefix))
+    if (!dptr->prefix.isEmpty() && !input.startsWith(dptr->prefix)) {
         input.prepend(dptr->prefix);
+        pos += dptr->prefix.length();
+    }
 
     if (!dptr->suffix.isEmpty() && !input.endsWith(dptr->suffix))
         input.append(dptr->suffix);
diff --git a/src/gui/widgets/qabstractspinbox_p.h b/src/gui/widgets/qabstractspinbox_p.h
index 3020cbcc1e..55f94d7172 100644
--- a/src/gui/widgets/qabstractspinbox_p.h
+++ b/src/gui/widgets/qabstractspinbox_p.h
@@ -98,7 +98,7 @@ public:
 
     void init();
     void reset();
-    void updateState(bool up);
+    void updateState(bool up, bool fromKeyboard = false);
     QString stripped(const QString &text, int *pos = 0) const;
     bool specialValue() const;
     virtual QVariant getZeroVariant() const;
@@ -129,6 +129,7 @@ public:
     QVariant value, minimum, maximum, singleStep;
     QVariant::Type type;
     int spinClickTimerId, spinClickTimerInterval, spinClickThresholdTimerId, spinClickThresholdTimerInterval;
+    int effectiveSpinRepeatRate;
     uint buttonState;
     mutable QString cachedText;
     mutable QVariant cachedValue;
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index bd1d8ba1f2..b7dd20c9cc 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -931,7 +931,10 @@ void QComboBoxPrivate::init()
                                  QSizePolicy::ComboBox));
     setLayoutItemMargins(QStyle::SE_ComboBoxLayoutItem);
     q->setModel(new QStandardItemModel(0, 1, q));
-    q->setAttribute(Qt::WA_InputMethodEnabled);
+    if (!q->isEditable())
+        q->setAttribute(Qt::WA_InputMethodEnabled, false);
+    else
+        q->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
 QComboBoxPrivateContainer* QComboBoxPrivate::viewContainer()
diff --git a/src/gui/widgets/qdial.cpp b/src/gui/widgets/qdial.cpp
index 95e6ed5a4e..dc02c024ae 100644
--- a/src/gui/widgets/qdial.cpp
+++ b/src/gui/widgets/qdial.cpp
@@ -59,6 +59,7 @@
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
 #endif
+#include <qmath.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -135,7 +136,7 @@ int QDialPrivate::valueFromPoint(const QPoint &p) const
     Q_Q(const QDial);
     double yy = (double)q->height()/2.0 - p.y();
     double xx = (double)p.x() - q->width()/2.0;
-    double a = (xx || yy) ? atan2(yy, xx) : 0;
+    double a = (xx || yy) ? qAtan2(yy, xx) : 0;
 
     if (a < Q_PI / -2)
         a = a + Q_PI * 2;
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp
index 0a26a777af..cf82da0f2b 100644
--- a/src/gui/widgets/qdockarealayout.cpp
+++ b/src/gui/widgets/qdockarealayout.cpp
@@ -1303,9 +1303,9 @@ QDockAreaLayoutInfo *QDockAreaLayoutInfo::info(const QList<int> &path)
         index = -index - 1;
     if (index >= item_list.count())
         return this;
-    if (path.count() == 1 || item_list.at(index).subinfo == 0)
+    if (path.count() == 1 || item_list[index].subinfo == 0)
         return this;
-    return item_list.at(index).subinfo->info(path.mid(1));
+    return item_list[index].subinfo->info(path.mid(1));
 }
 
 QRect QDockAreaLayoutInfo::itemRect(int index) const
diff --git a/src/gui/widgets/qlcdnumber.h b/src/gui/widgets/qlcdnumber.h
index e65637deef..b7162cd765 100644
--- a/src/gui/widgets/qlcdnumber.h
+++ b/src/gui/widgets/qlcdnumber.h
@@ -82,9 +82,10 @@ public:
     };
 
     bool smallDecimalPoint() const;
-
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numDigits() const;
     QT_DEPRECATED void setNumDigits(int nDigits);
+#endif
     int digitCount() const;
     void setDigitCount(int nDigits);
 
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index 2c1acdbb63..15dcda266e 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -1445,6 +1445,16 @@ bool QLineEdit::event(QEvent * e)
         d->control->processEvent(e);
     } else if (e->type() == QEvent::KeyRelease) {
         d->control->setCursorBlinkPeriod(QApplication::cursorFlashTime());
+    } else if (e->type() == QEvent::Show) {
+        //In order to get the cursor blinking if QComboBox::setEditable is called when the combobox has focus
+        if (hasFocus()) {
+            d->control->setCursorBlinkPeriod(QApplication::cursorFlashTime());
+            QStyleOptionFrameV2 opt;
+            initStyleOption(&opt);
+            if ((!hasSelectedText() && d->control->preeditAreaText().isEmpty())
+                || style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, this))
+                d->setCursorVisible(true);
+        }
     }
 
 #ifdef QT_KEYPAD_NAVIGATION
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp
index 23ab817ba5..c18ca25861 100644
--- a/src/gui/widgets/qlineedit_p.cpp
+++ b/src/gui/widgets/qlineedit_p.cpp
@@ -164,6 +164,9 @@ void QLineEditPrivate::init(const QString& txt)
 #endif
     QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)),
             q, SLOT(updateMicroFocus()));
+    
+    QObject::connect(control, SIGNAL(textChanged(const QString &)),
+            q, SLOT(updateMicroFocus()));
 
     // for now, going completely overboard with updates.
     QObject::connect(control, SIGNAL(selectionChanged()),
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index 89fe7b80a1..5e7d06e75e 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -684,8 +684,12 @@ void QPlainTextEditPrivate::ensureVisible(int position, bool center, bool forceC
 
         qreal h = center ? line.naturalTextRect().center().y() : line.naturalTextRect().bottom();
 
+        QTextBlock previousVisibleBlock = block;
         while (h < height && block.previous().isValid()) {
-            block = block.previous();
+            previousVisibleBlock = block;
+            do {
+                block = block.previous();
+            } while (!block.isVisible() && block.previous().isValid());
             h += q->blockBoundingRect(block).height();
         }
 
@@ -699,8 +703,8 @@ void QPlainTextEditPrivate::ensureVisible(int position, bool center, bool forceC
             ++l;
         }
 
-        if (block.next().isValid() && l >= lineCount) {
-            block = block.next();
+        if (l >= lineCount) {
+            block = previousVisibleBlock;
             l = 0;
         }
         setTopBlock(block.blockNumber(), l);
@@ -761,6 +765,7 @@ void QPlainTextEditPrivate::init(const QString &txt)
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged()));
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
 
+    QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus()));
 
     // set a null page size initially to avoid any relayouting until the textedit
     // is shown. relayoutDocument() will take care of setting the page size to the
diff --git a/src/gui/widgets/qprintpreviewwidget.h b/src/gui/widgets/qprintpreviewwidget.h
index 08e596d43a..d8504de369 100644
--- a/src/gui/widgets/qprintpreviewwidget.h
+++ b/src/gui/widgets/qprintpreviewwidget.h
@@ -82,7 +82,9 @@ public:
     ViewMode viewMode() const;
     ZoomMode zoomMode() const;
     int currentPage() const;
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numPages() const;
+#endif
     int pageCount() const;
     void setVisible(bool visible);
 
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 1bc0bf1936..63fac2a5a6 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -158,6 +158,8 @@ void QTextEditPrivate::init(const QString &html)
     QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged()));
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
 
+    QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus()));
+
     QTextDocument *doc = control->document();
     // set a null page size initially to avoid any relayouting until the textedit
     // is shown. relayoutDocument() will take care of setting the page size to the
diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri
index c4459415a0..625b871cf7 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
@@ -17,6 +17,8 @@ SOURCES += $$PWD/qaudio.cpp \
            $$PWD/qaudioengine.cpp \
            $$PWD/qaudiodevicefactory.cpp
 
+contains(QT_CONFIG, audio-backend) {
+
 mac {
     HEADERS +=  $$PWD/qaudioinput_mac_p.h \
                 $$PWD/qaudiooutput_mac_p.h \
@@ -51,3 +53,6 @@ mac {
         }
     }
 }
+} else {
+    DEFINES += QT_NO_AUDIO_BACKEND
+}
diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp
index 89e439419e..bc1656ddf5 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/audio/qaudiodevicefactory.cpp
@@ -45,6 +45,7 @@
 #include <private/qfactoryloader_p.h>
 #include "qaudiodevicefactory_p.h"
 
+#ifndef QT_NO_AUDIO_BACKEND
 #if defined(Q_OS_WIN)
 #include "qaudiodeviceinfo_win32_p.h"
 #include "qaudiooutput_win32_p.h"
@@ -58,6 +59,7 @@
 #include "qaudiooutput_alsa_p.h"
 #include "qaudioinput_alsa_p.h"
 #endif
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -125,10 +127,12 @@ public:
 QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
 {
     QList<QAudioDeviceInfo> devices;
+#ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     foreach (const QByteArray &handle, QAudioDeviceInfoInternal::availableDevices(mode))
         devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode);
 #endif
+#endif
     QFactoryLoader* l = loader();
 
     foreach (QString const& key, l->keys()) {
@@ -153,9 +157,11 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
         if (list.size() > 0)
             return QAudioDeviceInfo(QLatin1String("default"), list.at(0), QAudio::AudioInput);
     }
+#ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput);
 #endif
+#endif
     return QAudioDeviceInfo();
 }
 
@@ -168,9 +174,11 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice()
         if (list.size() > 0)
             return QAudioDeviceInfo(QLatin1String("default"), list.at(0), QAudio::AudioOutput);
     }
+#ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput);
 #endif
+#endif
     return QAudioDeviceInfo();
 }
 
@@ -178,10 +186,12 @@ QAbstractAudioDeviceInfo* QAudioDeviceFactory::audioDeviceInfo(const QString &re
 {
     QAbstractAudioDeviceInfo *rc = 0;
 
+#ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     if (realm == QLatin1String("builtin"))
         return new QAudioDeviceInfoInternal(handle, mode);
 #endif
+#endif
     QAudioEngineFactoryInterface* plugin =
         qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(realm));
 
@@ -205,10 +215,12 @@ QAbstractAudioInput* QAudioDeviceFactory::createInputDevice(QAudioDeviceInfo con
 {
     if (deviceInfo.isNull())
         return new QNullInputDevice();
+#ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     if (deviceInfo.realm() == QLatin1String("builtin"))
         return new QAudioInputPrivate(deviceInfo.handle(), format);
 #endif
+#endif
     QAudioEngineFactoryInterface* plugin =
         qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(deviceInfo.realm()));
 
@@ -222,10 +234,12 @@ QAbstractAudioOutput* QAudioDeviceFactory::createOutputDevice(QAudioDeviceInfo c
 {
     if (deviceInfo.isNull())
         return new QNullOutputDevice();
+#ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     if (deviceInfo.realm() == QLatin1String("builtin"))
         return new QAudioOutputPrivate(deviceInfo.handle(), format);
 #endif
+#endif
     QAudioEngineFactoryInterface* plugin =
         qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(deviceInfo.realm()));
 
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index 8b368d59f4..d81df7aebf 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -77,8 +77,12 @@ QT_BEGIN_NAMESPACE
     file, you can:
 
     \code
+      QFile outputFile;   // class member.
+      QAudioInput* audio; // class member.
+    \endcode
+
+    \code
     {
-      QFile outputFile;
       outputFile.setFileName("/tmp/test.raw");
       outputFile.open( QIODevice::WriteOnly | QIODevice::Truncate );
 
@@ -91,7 +95,13 @@ QT_BEGIN_NAMESPACE
       format.setByteOrder(QAudioFormat::LittleEndian);
       format.setSampleType(QAudioFormat::UnSignedInt);
 
-      QAudioInput *audio = new QAudioInput(format, this);
+      if (QAudioDeviceInfo info(QAudioDeviceInfo::defaultInputDevice());
+      if (!info.isFormatSupported(format)) {
+          qWarning()<<"default format not supported try to use nearest";
+          format = info.nearestFormat(format);
+      }
+
+      audio = new QAudioInput(format, this);
       QTimer::singleShot(3000, this, SLOT(stopRecording()));
       audio->start(outputFile);
       // Records audio for 3000ms
@@ -109,6 +119,7 @@ QT_BEGIN_NAMESPACE
     {
       audio->stop();
       outputFile->close();
+      delete audio;
     }
     \endcode
 
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index f8f2fa1a33..1c7b6171b3 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -73,7 +73,11 @@ QT_BEGIN_NAMESPACE
     simple as:
 
     \code
-      QFile inputFile;
+      QFile inputFile;     // class member.
+      QAudioOutput* audio; // class member.
+    \endcode
+
+    \code
       inputFile.setFileName("/tmp/test.raw");
       inputFile.open(QIODevice::ReadOnly);
 
@@ -86,7 +90,13 @@ QT_BEGIN_NAMESPACE
       format.setByteOrder(QAudioFormat::LittleEndian);
       format.setSampleType(QAudioFormat::UnSignedInt);
 
-      QAudioOutput *audio = new QAudioOutput(format, this);
+      QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
+      if (!info.isFormatSupported(format)) {
+          qWarning()<<"raw audio format not supported by backend, cannot play audio.";
+          return;
+      }
+
+      audio = new QAudioOutput(format, this);
       connect(audio,SIGNAL(stateChanged(QAudio::State)),SLOT(finishedPlaying(QAudio::State)));
       audio->start(inputFile);
 
@@ -104,6 +114,7 @@ QT_BEGIN_NAMESPACE
         if(state == QAudio::IdleState) {
           audio->stop();
           inputFile.close();
+          delete audio;
         }
       }
     \endcode
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 9ab4057488..e6ca36752a 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -171,7 +171,7 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
     \value UnknownProxyError            an unknown proxy-related error
     was detected
 
-    \value UnknownContentError          an unknonwn error related to
+    \value UnknownContentError          an unknown error related to
     the remote content was detected
 
     \value ProtocolFailure              a breakdown in protocol was
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 98a39cdff9..e77a425dc8 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -60,11 +60,9 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QHostInfoAgent, theAgent)
-void QHostInfoAgent::staticCleanup()
-{
-    theAgent()->cleanup();
-}
+#ifndef QT_NO_THREAD
+Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager)
+#endif
 
 //#define QHOSTINFO_DEBUG
 
@@ -143,6 +141,9 @@ static QBasicAtomicInt theIdCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
 
     \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 4
 
+    \note There is no guarantee on the order the signals will be emitted
+    if you start multiple requests with lookupHost().
+
     \sa abortHostLookup(), addresses(), error(), fromName()
 */
 int QHostInfo::lookupHost(const QString &name, QObject *receiver,
@@ -159,38 +160,32 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
 
     qRegisterMetaType<QHostInfo>("QHostInfo");
 
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
-    QWindowsSockInit bust; // makes sure WSAStartup was callled
-#endif
-
-    QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
-    result.data()->autoDelete = false;
-    QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
-                     receiver, member);
-    int id = result.data()->lookupId = theIdCounter.fetchAndAddRelaxed(1);
+    int id = theIdCounter.fetchAndAddRelaxed(1); // generate unique ID
 
     if (name.isEmpty()) {
-        QHostInfo info(id);
-        info.setError(QHostInfo::HostNotFound);
-        info.setErrorString(QObject::tr("No host name given"));
-        QMetaObject::invokeMethod(result.data(), "emitResultsReady", Qt::QueuedConnection,
-                                  Q_ARG(QHostInfo, info));
-        result.take()->autoDelete = true;
+        QHostInfo hostInfo(id);
+        hostInfo.setError(QHostInfo::HostNotFound);
+        hostInfo.setErrorString(QObject::tr("No host name given"));
+        QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
+        QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
+                         receiver, member, Qt::QueuedConnection);
+        result.data()->emitResultsReady(hostInfo);
         return id;
     }
 
-    QHostInfoAgent *agent = theAgent();
-    agent->addHostName(name, result.take());
-
-#if !defined QT_NO_THREAD
-    if (!agent->isRunning())
-        agent->start();
+#ifdef QT_NO_THREAD
+    QHostInfo hostInfo = QHostInfoAgent::fromName(name);
+    hostInfo.setLookupId(id);
+    QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
+    QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
+                     receiver, member, Qt::QueuedConnection);
+    result.data()->emitResultsReady(hostInfo);
 #else
-//    if (!agent->isRunning())
-	agent->run();
-//    else
-//	agent->wakeOne();
+    QHostInfoRunnable* runnable = new QHostInfoRunnable(name, id);
+    QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection);
+    theHostInfoLookupManager()->scheduleLookup(runnable);
 #endif
+
     return id;
 }
 
@@ -201,8 +196,12 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
 */
 void QHostInfo::abortHostLookup(int id)
 {
-    QHostInfoAgent *agent = theAgent();
-    agent->abortLookup(id);
+#ifndef QT_NO_THREAD
+    theHostInfoLookupManager()->abortLookup(id);
+#else
+    // we cannot abort if it was non threaded.. the result signal has already been posted
+    Q_UNUSED(id);
+#endif
 }
 
 /*!
@@ -228,70 +227,6 @@ QHostInfo QHostInfo::fromName(const QString &name)
 }
 
 /*!
-    \internal
-    Pops a query off the queries list, performs a blocking call to
-    QHostInfoAgent::lookupHost(), and emits the resultsReady()
-    signal. This process repeats until the queries list is empty.
-*/
-void QHostInfoAgent::run()
-{
-#ifndef QT_NO_THREAD
-    // Dont' allow thread termination during event delivery, but allow it
-    // during the actual blocking host lookup stage.
-    setTerminationEnabled(false);
-    forever
-#endif
-    {
-        QHostInfoQuery *query;
-        {
-#ifndef QT_NO_THREAD
-            // the queries list is shared between threads. lock all
-            // access to it.
-            QMutexLocker locker(&mutex);
-            if (!quit && queries.isEmpty())
-                cond.wait(&mutex);
-            if (quit) {
-                // Reset the quit variable in case QCoreApplication is
-                // destroyed and recreated.
-                quit = false;
-                break;
-            }
-	    if (queries.isEmpty())
-		continue;
-#else
-	    if (queries.isEmpty())
-		return;
-#endif
-            query = queries.takeFirst();
-            pendingQueryId = query->object->lookupId;
-        }
-
-#if defined(QHOSTINFO_DEBUG)
-        qDebug("QHostInfoAgent::run(%p): looking up \"%s\"", this,
-               query->hostName.toLatin1().constData());
-#endif
-
-#ifndef QT_NO_THREAD
-        // Start query - allow termination at this point, but not outside. We
-        // don't want to all termination during event delivery, but we don't
-        // want the lookup to prevent the app from quitting (the agent
-        // destructor terminates the thread).
-        setTerminationEnabled(true);
-#endif
-        QHostInfo info = fromName(query->hostName);
-#ifndef QT_NO_THREAD
-        setTerminationEnabled(false);
-#endif
-
-        int id = query->object->lookupId;
-        info.setLookupId(id);
-        if (pendingQueryId == id)
-            query->object->emitResultsReady(info);
-        delete query;
-    }
-}
-
-/*!
     \enum QHostInfo::HostInfoError
 
     This enum describes the various errors that can occur when trying
@@ -467,4 +402,174 @@ void QHostInfo::setErrorString(const QString &str)
     \sa hostName()
 */
 
+#ifndef QT_NO_THREAD
+QHostInfoRunnable::QHostInfoRunnable(QString hn, int i) : toBeLookedUp(hn), id(i)
+{
+    setAutoDelete(true);
+}
+
+// the QHostInfoLookupManager will at some point call this via a QThreadPool
+void QHostInfoRunnable::run()
+{
+    QHostInfoLookupManager *manager = theHostInfoLookupManager();
+    // check aborted
+    if (manager->wasAborted(id)) {
+        manager->lookupFinished(this);
+        return;
+    }
+
+    // check cache
+    // FIXME
+
+    // if not in cache: OS lookup
+    QHostInfo hostInfo = QHostInfoAgent::fromName(toBeLookedUp);
+
+    // save to cache
+    // FIXME
+
+    // check aborted again
+    if (manager->wasAborted(id)) {
+        manager->lookupFinished(this);
+        return;
+    }
+
+    // signal emission
+    hostInfo.setLookupId(id);
+    resultEmitter.emitResultsReady(hostInfo);
+
+    manager->lookupFinished(this);
+
+    // thread goes back to QThreadPool
+}
+
+QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), wasDeleted(false)
+{
+    moveToThread(QCoreApplicationPrivate::mainThread());
+    threadPool.setMaxThreadCount(5); // do 5 DNS lookups in parallel
+}
+
+QHostInfoLookupManager::~QHostInfoLookupManager()
+{
+    wasDeleted = true;
+}
+
+void QHostInfoLookupManager::work()
+{
+    if (wasDeleted)
+        return;
+
+    // goals of this function:
+    //  - launch new lookups via the thread pool
+    //  - make sure only one lookup per host/IP is in progress
+
+    QMutexLocker locker(&mutex);
+
+    if (!finishedLookups.isEmpty()) {
+        // remove ID from aborted if it is in there
+        for (int i = 0; i < finishedLookups.length(); i++) {
+           abortedLookups.removeAll(finishedLookups.at(i)->id);
+        }
+
+        finishedLookups.clear();
+    }
+
+    if (!postponedLookups.isEmpty()) {
+        // try to start the postponed ones
+
+        QMutableListIterator<QHostInfoRunnable*> iterator(postponedLookups);
+        while (iterator.hasNext()) {
+            QHostInfoRunnable* postponed = iterator.next();
+
+            // check if none of the postponed hostnames is currently running
+            bool alreadyRunning = false;
+            for (int i = 0; i < currentLookups.length(); i++) {
+                if (currentLookups.at(i)->toBeLookedUp == postponed->toBeLookedUp) {
+                    alreadyRunning = true;
+                    break;
+                }
+            }
+            if (!alreadyRunning) {
+                iterator.remove();
+                scheduledLookups.prepend(postponed); // prepend! we want to finish it ASAP
+            }
+        }
+    }
+
+    if (!scheduledLookups.isEmpty()) {
+        // try to start the new ones
+        QMutableListIterator<QHostInfoRunnable*> iterator(scheduledLookups);
+        while (iterator.hasNext()) {
+            QHostInfoRunnable *scheduled = iterator.next();
+
+            // check if a lookup for this host is already running, then postpone
+            for (int i = 0; i < currentLookups.size(); i++) {
+                if (currentLookups.at(i)->toBeLookedUp == scheduled->toBeLookedUp) {
+                    iterator.remove();
+                    postponedLookups.append(scheduled);
+                    scheduled = 0;
+                    break;
+                }
+            }
+
+            if (scheduled && threadPool.tryStart(scheduled)) {
+                // runnable now running in new thread, track this in currentLookups
+                iterator.remove();
+                currentLookups.append(scheduled);
+            } else if (scheduled) {
+                // wanted to start, but could not because thread pool is busy
+                break;
+            } else {
+                // was postponed, continue iterating
+                continue;
+            }
+        };
+    }
+}
+
+// called by QHostInfo
+void QHostInfoLookupManager::scheduleLookup(QHostInfoRunnable *r)
+{
+    if (wasDeleted)
+        return;
+
+    QMutexLocker locker(&this->mutex);
+    scheduledLookups.enqueue(r);
+    work();
+}
+
+// called by QHostInfo
+void QHostInfoLookupManager::abortLookup(int id)
+{
+    if (wasDeleted)
+        return;
+
+    QMutexLocker locker(&this->mutex);
+    if (!abortedLookups.contains(id))
+        abortedLookups.append(id);
+}
+
+// called from QHostInfoRunnable
+bool QHostInfoLookupManager::wasAborted(int id)
+{
+    if (wasDeleted)
+        return true;
+
+    QMutexLocker locker(&this->mutex);
+    return abortedLookups.contains(id);
+}
+
+// called from QHostInfoRunnable
+void QHostInfoLookupManager::lookupFinished(QHostInfoRunnable *r)
+{
+    if (wasDeleted)
+        return;
+
+    QMutexLocker locker(&this->mutex);
+    currentLookups.removeOne(r);
+    finishedLookups.append(r);
+    work();
+}
+
+#endif // QT_NO_THREAD
+
 QT_END_NAMESPACE
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index afd3570e4c..643bb7304b 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -61,17 +61,17 @@
 #include "QtCore/qobject.h"
 #include "QtCore/qpointer.h"
 
-#if !defined QT_NO_THREAD
+#ifndef QT_NO_THREAD
 #include "QtCore/qthread.h"
-#    define QHostInfoAgentBase QThread
-#else
-#    define QHostInfoAgentBase QObject
+#include "QtCore/qthreadpool.h"
+#include "QtCore/qmutex.h"
+#include "QtCore/qrunnable.h"
+#include "QtCore/qlist.h"
+#include "QtCore/qqueue.h"
 #endif
 
 QT_BEGIN_NAMESPACE
 
-static const int QHOSTINFO_THREAD_WAIT = 250; // ms
-
 class QHostInfoResult : public QObject
 {
     Q_OBJECT
@@ -79,102 +79,18 @@ public Q_SLOTS:
     inline void emitResultsReady(const QHostInfo &info)
     {
         emit resultsReady(info);
-        if (autoDelete)
-            delete this;
     }
 
 Q_SIGNALS:
-    void resultsReady(const QHostInfo &info);
-
-public:
-    int lookupId;
-    bool autoDelete;
+    void resultsReady(const QHostInfo info);
 };
 
-struct QHostInfoQuery
-{
-    inline QHostInfoQuery() : object(0) {}
-    inline ~QHostInfoQuery() { delete object; }
-    inline QHostInfoQuery(const QString &name, QHostInfoResult *result)
-        : hostName(name), object(result) {}
-
-    QString hostName;
-    QHostInfoResult *object;
-};
-
-class QHostInfoAgent : public QHostInfoAgentBase
+// needs to be QObject because fromName calls tr()
+class QHostInfoAgent : public QObject
 {
     Q_OBJECT
 public:
-    inline QHostInfoAgent()
-    {
-        // There is a chance that there will be two instances of
-        // QHostInfoAgent if two threads try to get Q_GLOBAL_STATIC
-        // object at the same time. The second object will be deleted
-        // immediately before anyone uses it, but we need to be
-        // careful about what we do in the constructor.
-        static QBasicAtomicInt done = Q_BASIC_ATOMIC_INITIALIZER(0);
-        if (done.testAndSetRelaxed(0, 1))
-            qAddPostRoutine(staticCleanup);
-        moveToThread(QCoreApplicationPrivate::mainThread());
-        quit = false;
-        pendingQueryId = -1;
-    }
-    inline ~QHostInfoAgent()
-    { cleanup(); }
-
-    void run();
     static QHostInfo fromName(const QString &hostName);
-
-    inline void addHostName(const QString &name, QHostInfoResult *result)
-    {
-        QMutexLocker locker(&mutex);
-        queries << new QHostInfoQuery(name, result);
-        cond.wakeOne();
-    }
-
-    inline void abortLookup(int id)
-    {
-        QMutexLocker locker(&mutex);
-        for (int i = 0; i < queries.size(); ++i) {
-            QHostInfoResult *result = queries.at(i)->object;
-            if (result->lookupId == id) {
-                result->disconnect();
-                delete queries.takeAt(i);
-                return;
-            }
-        }
-        if (pendingQueryId == id)
-            pendingQueryId = -1;
-    }
-
-    static void staticCleanup();
-
-public Q_SLOTS:
-    inline void cleanup()
-    {
-        {
-            QMutexLocker locker(&mutex);
-            qDeleteAll(queries);
-            queries.clear();
-            quit = true;
-            cond.wakeOne();
-        }
-#ifndef QT_NO_THREAD
-        if (!wait(QHOSTINFO_THREAD_WAIT)) {
-            terminate();
-            // Don't wait forever; see QTBUG-5296.
-            wait(QHOSTINFO_THREAD_WAIT);
-        }
-#endif
-    }
-
-private:
-    QList<QHostInfoQuery *> queries;
-    QMutex mutex;
-    QWaitCondition cond;
-    volatile bool quit;
-    int pendingQueryId;
 };
 
 class QHostInfoPrivate
@@ -194,6 +110,52 @@ public:
     int lookupId;
 };
 
+#ifndef QT_NO_THREAD
+// the following classes are used for the (normal) case: We use multiple threads to lookup DNS
+
+class QHostInfoRunnable : public QRunnable
+{
+public:
+    QHostInfoRunnable (QString hn, int i);
+    void run();
+
+    QString toBeLookedUp;
+    int id;
+    QHostInfoResult resultEmitter;
+};
+
+class QHostInfoLookupManager : public QObject
+{
+    Q_OBJECT
+public:
+    QHostInfoLookupManager();
+    ~QHostInfoLookupManager();
+
+    void work();
+
+    // called from QHostInfo
+    void scheduleLookup(QHostInfoRunnable *r);
+    void abortLookup(int id);
+
+    // called from QHostInfoRunnable
+    void lookupFinished(QHostInfoRunnable *r);
+    bool wasAborted(int id);
+
+protected:
+    QList<QHostInfoRunnable*> currentLookups; // in progress
+    QList<QHostInfoRunnable*> postponedLookups; // postponed because in progress for same host
+    QQueue<QHostInfoRunnable*> scheduledLookups; // not yet started
+    QList<QHostInfoRunnable*> finishedLookups; // recently finished
+    QList<int> abortedLookups; // ids of aborted lookups
+
+    QThreadPool threadPool;
+
+    QMutex mutex;
+
+    bool wasDeleted;
+};
+#endif
+
 QT_END_NAMESPACE
 
 #endif // QHOSTINFO_P_H
diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index 720aaa5639..727a8b0f1e 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -105,11 +105,7 @@ static void resolveLibrary()
 #include <qmutex.h>
 QMutex qPrivCEMutex;
 #endif
-/*
-    Performs a blocking call to gethostbyname or getaddrinfo, stores
-    the results in a QHostInfo structure and emits the
-    resultsReady() signal.
-*/
+
 QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 {
 #if defined(Q_OS_WINCE)
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
index e3193894b3..e0033bef01 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
@@ -68,7 +68,7 @@ class Q_OPENGL_EXPORT QGLCustomShaderStage
 public:
     QGLCustomShaderStage();
     virtual ~QGLCustomShaderStage();
-    virtual void setUniforms(QGLShaderProgram*) = 0;
+    virtual void setUniforms(QGLShaderProgram*) {}
 
     void setUniformsDirty();
 
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 3fce3841ab..fb9bcb40f6 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -589,53 +589,31 @@ void QGL2PaintEngineExPrivate::updateMatrix()
     // matrix multiplication as most of the components are trivial.
     const QTransform& transform = q->state()->matrix;
 
-    if (mode == TextDrawingMode) {
-        // Text drawing mode is only used for non-scaling transforms
-        pmvMatrix[0][0] = 2.0 / width;
-        pmvMatrix[0][1] = 0.0;
-        pmvMatrix[0][2] = 0.0;
-        pmvMatrix[0][3] = 0.0;
-        pmvMatrix[1][0] = 0.0;
-        pmvMatrix[1][1] = -2.0 / height;
-        pmvMatrix[1][2] = 0.0;
-        pmvMatrix[1][3] = 0.0;
-        pmvMatrix[2][0] = 0.0;
-        pmvMatrix[2][1] = 0.0;
-        pmvMatrix[2][2] = -1.0;
-        pmvMatrix[2][3] = 0.0;
-        pmvMatrix[3][0] = pmvMatrix[0][0] * qRound(transform.dx()) - 1.0;
-        pmvMatrix[3][1] = pmvMatrix[1][1] * qRound(transform.dy()) + 1.0;
-        pmvMatrix[3][2] = 0.0;
-        pmvMatrix[3][3] = 1.0;
-
-        inverseScale = 1;
-    } else {
-        qreal wfactor = 2.0 / width;
-        qreal hfactor = -2.0 / height;
-
-        pmvMatrix[0][0] = wfactor * transform.m11() - transform.m13();
-        pmvMatrix[0][1] = hfactor * transform.m12() + transform.m13();
-        pmvMatrix[0][2] = 0.0;
-        pmvMatrix[0][3] = transform.m13();
-        pmvMatrix[1][0] = wfactor * transform.m21() - transform.m23();
-        pmvMatrix[1][1] = hfactor * transform.m22() + transform.m23();
-        pmvMatrix[1][2] = 0.0;
-        pmvMatrix[1][3] = transform.m23();
-        pmvMatrix[2][0] = 0.0;
-        pmvMatrix[2][1] = 0.0;
-        pmvMatrix[2][2] = -1.0;
-        pmvMatrix[2][3] = 0.0;
-        pmvMatrix[3][0] = wfactor * transform.dx() - transform.m33();
-        pmvMatrix[3][1] = hfactor * transform.dy() + transform.m33();
-        pmvMatrix[3][2] = 0.0;
-        pmvMatrix[3][3] = transform.m33();
-
-        // 1/10000 == 0.0001, so we have good enough res to cover curves
-        // that span the entire widget...
-        inverseScale = qMax(1 / qMax( qMax(qAbs(transform.m11()), qAbs(transform.m22())),
-                    qMax(qAbs(transform.m12()), qAbs(transform.m21())) ),
-                qreal(0.0001));
-    }
+    qreal wfactor = 2.0 / width;
+    qreal hfactor = -2.0 / height;
+
+    pmvMatrix[0][0] = wfactor * transform.m11() - transform.m13();
+    pmvMatrix[0][1] = hfactor * transform.m12() + transform.m13();
+    pmvMatrix[0][2] = 0.0;
+    pmvMatrix[0][3] = transform.m13();
+    pmvMatrix[1][0] = wfactor * transform.m21() - transform.m23();
+    pmvMatrix[1][1] = hfactor * transform.m22() + transform.m23();
+    pmvMatrix[1][2] = 0.0;
+    pmvMatrix[1][3] = transform.m23();
+    pmvMatrix[2][0] = 0.0;
+    pmvMatrix[2][1] = 0.0;
+    pmvMatrix[2][2] = -1.0;
+    pmvMatrix[2][3] = 0.0;
+    pmvMatrix[3][0] = wfactor * transform.dx() - transform.m33();
+    pmvMatrix[3][1] = hfactor * transform.dy() + transform.m33();
+    pmvMatrix[3][2] = 0.0;
+    pmvMatrix[3][3] = transform.m33();
+
+    // 1/10000 == 0.0001, so we have good enough res to cover curves
+    // that span the entire widget...
+    inverseScale = qMax(1 / qMax( qMax(qAbs(transform.m11()), qAbs(transform.m22())),
+                                  qMax(qAbs(transform.m12()), qAbs(transform.m21())) ),
+                        qreal(0.0001));
 
     matrixDirty = false;
 
@@ -817,17 +795,12 @@ void QGL2PaintEngineExPrivate::transferMode(EngineMode newMode)
         lastTexture = GLuint(-1);
     }
 
-    if (mode == TextDrawingMode)
-        matrixDirty = true;
-
     if (newMode == TextDrawingMode) {
         glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
         glEnableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
 
         glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray.data());
         glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray.data());
-
-        matrixDirty = true;
     }
 
     if (newMode == ImageDrawingMode) {
@@ -930,7 +903,7 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
                 int floatSizeInBytes = vertexCount * 2 * sizeof(float);
                 cache->vertexCount = vertexCount;
                 cache->primitiveType = GL_TRIANGLE_FAN;
-                cache->iscale = inverseScale;               
+                cache->iscale = inverseScale;
 #ifdef QT_OPENGL_CACHE_AS_VBOS
                 glGenBuffers(1, &cache->vbo);
                 glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
@@ -1545,21 +1518,21 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
 
     const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
 
-    bool drawCached = true;
+    QTransform::TransformationType txtype = s->matrix.type();
 
-    if (s->matrix.type() > QTransform::TxTranslate)
-        drawCached = false;
+    float det = s->matrix.determinant();
+    bool drawCached = txtype < QTransform::TxProject;
 
-    // don't try to cache huge fonts
+    // don't try to cache huge fonts or vastly transformed fonts
     const qreal pixelSize = ti.fontEngine->fontDef.pixelSize;
-    if (pixelSize * pixelSize * qAbs(s->matrix.determinant()) >= 64 * 64)
+    if (pixelSize * pixelSize * qAbs(det) >= 64 * 64 || det < 0.25f || det > 4.f)
         drawCached = false;
 
     QFontEngineGlyphCache::Type glyphType = ti.fontEngine->glyphFormat >= 0
                                             ? QFontEngineGlyphCache::Type(ti.fontEngine->glyphFormat)
                                             : d->glyphCacheType;
 
-    if (d->inRenderText)
+    if (d->inRenderText || txtype > QTransform::TxTranslate)
         glyphType = QFontEngineGlyphCache::Raster_A8;
 
     if (glyphType == QFontEngineGlyphCache::Raster_RGBMask
@@ -1581,7 +1554,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
                                                 const QTextItemInt &ti)
 {
     Q_Q(QGL2PaintEngineEx);
-    QOpenGL2PaintEngineState *s = q->state();
 
     QVarLengthArray<QFixedPoint> positions;
     QVarLengthArray<glyph_t> glyphs;
@@ -1589,10 +1561,10 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
     ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions);
 
     QGLTextureGlyphCache *cache =
-        (QGLTextureGlyphCache *) ti.fontEngine->glyphCache(ctx, s->matrix);
+            (QGLTextureGlyphCache *) ti.fontEngine->glyphCache(ctx, glyphType, QTransform());
 
     if (!cache || cache->cacheType() != glyphType) {
-        cache = new QGLTextureGlyphCache(ctx, glyphType, s->matrix);
+        cache = new QGLTextureGlyphCache(ctx, glyphType, QTransform());
         ti.fontEngine->setGlyphCache(ctx, cache);
     }
 
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 00844765a3..77ca3a86f0 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -291,10 +291,7 @@ public:
     QScopedPointer<QPixmapFilter> convolutionFilter;
     QScopedPointer<QPixmapFilter> colorizeFilter;
     QScopedPointer<QPixmapFilter> blurFilter;
-    QScopedPointer<QPixmapFilter> animationBlurFilter;
-    QScopedPointer<QPixmapFilter> fastBlurFilter;
     QScopedPointer<QPixmapFilter> dropShadowFilter;
-    QScopedPointer<QPixmapFilter> fastDropShadowFilter;
 
     QSet<QVectorPath::CacheEntry *> pathCaches;
     QVector<GLuint> unusedVBOSToClean;
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 1bd1b91ada..466e851445 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -397,8 +397,7 @@ static inline GLint qgluProject(GLdouble objx, GLdouble objy, GLdouble objz,
     \i \link setDirectRendering() Direct rendering:\endlink Enabled.
     \i \link setOverlay() Overlay:\endlink Disabled.
     \i \link setPlane() Plane:\endlink 0 (i.e., normal plane).
-    \i \link setSampleBuffers() Multisample buffers:\endlink Enabled on
-       OpenGL/ES 2.0, disabled on other platforms.
+    \i \link setSampleBuffers() Multisample buffers:\endlink Disabled.
     \endlist
 */
 
@@ -2064,6 +2063,29 @@ QGLTexture *QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G
 
 // #define QGL_BIND_TEXTURE_DEBUG
 
+// map from Qt's ARGB endianness-dependent format to GL's big-endian RGBA layout
+static inline void qgl_byteSwapImage(QImage &img, GLenum pixel_type)
+{
+    const int width = img.width();
+    const int height = img.height();
+
+    if (pixel_type == GL_UNSIGNED_INT_8_8_8_8_REV
+        || (pixel_type == GL_UNSIGNED_BYTE && QSysInfo::ByteOrder == QSysInfo::LittleEndian))
+    {
+        for (int i = 0; i < height; ++i) {
+            uint *p = (uint *) img.scanLine(i);
+            for (int x = 0; x < width; ++x)
+                p[x] = ((p[x] << 16) & 0xff0000) | ((p[x] >> 16) & 0xff) | (p[x] & 0xff00ff00);
+        }
+    } else {
+        for (int i = 0; i < height; ++i) {
+            uint *p = (uint *) img.scanLine(i);
+            for (int x = 0; x < width; ++x)
+                p[x] = (p[x] << 8) | ((p[x] >> 24) & 0xff);
+        }
+    }
+}
+
 QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint internalFormat,
                                            const qint64 key, QGLContext::BindOptions options)
 {
@@ -2216,23 +2238,7 @@ QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G
         // 32 in the switch above is for the RGB16 case, where we set
         // the format to GL_RGB
         Q_ASSERT(img.depth() == 32);
-        const int width = img.width();
-        const int height = img.height();
-
-        if (pixel_type == GL_UNSIGNED_INT_8_8_8_8_REV
-            || (pixel_type == GL_UNSIGNED_BYTE && QSysInfo::ByteOrder == QSysInfo::LittleEndian)) {
-            for (int i=0; i < height; ++i) {
-                uint *p = (uint *) img.scanLine(i);
-                for (int x=0; x<width; ++x)
-                    p[x] = ((p[x] << 16) & 0xff0000) | ((p[x] >> 16) & 0xff) | (p[x] & 0xff00ff00);
-            }
-        } else {
-            for (int i=0; i < height; ++i) {
-                uint *p = (uint *) img.scanLine(i);
-                for (int x=0; x<width; ++x)
-                    p[x] = (p[x] << 8) | ((p[x] >> 24) & 0xff);
-            }
-        }
+        qgl_byteSwapImage(img, pixel_type);
     }
 #ifdef QT_OPENGL_ES
     // OpenGL/ES requires that the internal and external formats be identical.
@@ -3804,6 +3810,11 @@ bool QGLWidget::event(QEvent *e)
     }
 
 #if defined(QT_OPENGL_ES)
+    // A re-parent is likely to destroy the X11 window and re-create it. It is important
+    // that we free the EGL surface _before_ the winID changes - otherwise we can leak.
+    if (e->type() == QEvent::ParentAboutToChange)
+        d->glcx->d_func()->destroyEglSurfaceForDevice();
+
     if ((e->type() == QEvent::ParentChange) || (e->type() == QEvent::WindowStateChange)) {
         // The window may have been re-created during re-parent or state change - if so, the EGL
         // surface will need to be re-created.
@@ -4291,6 +4302,7 @@ static void qt_save_gl_state()
     glDisable(GL_CULL_FACE);
     glDisable(GL_LIGHTING);
     glDisable(GL_STENCIL_TEST);
+    glDisable(GL_DEPTH_TEST);
     glEnable(GL_BLEND);
     glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }
@@ -4344,6 +4356,10 @@ static void qt_gl_draw_text(QPainter *p, int x, int y, const QString &str,
    \note This function clears the stencil buffer.
 
    \note This function is not supported on OpenGL/ES systems.
+
+   \note This function temporarily disables depth-testing when the
+   text is drawn.
+
    \l{Overpainting Example}{Overpaint} with QPainter::drawText() instead.
 */
 
@@ -4434,6 +4450,13 @@ void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font,
     have the labels move with the model as it is rotated etc.
 
     \note This function is not supported on OpenGL/ES systems.
+
+    \note If depth testing is enabled before this function is called,
+    then the drawn text will be depth-tested against the models that
+    have already been drawn in the scene.  Use \c{glDisable(GL_DEPTH_TEST)}
+    before calling this function to annotate the models without
+    depth-testing the text.
+
     \l{Overpainting Example}{Overpaint} with QPainter::drawText() instead.
 */
 void QGLWidget::renderText(double x, double y, double z, const QString &str, const QFont &font, int)
@@ -4823,38 +4846,39 @@ QGLWidget::QGLWidget(QGLContext *context, QWidget *parent,
 
 void QGLExtensions::init_extensions()
 {
-    QList<QByteArray> extensions = QByteArray(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS))).split(' ');
-    if (extensions.contains("GL_ARB_texture_rectangle"))
+    QGLExtensionMatcher extensions(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)));
+
+    if (extensions.match("GL_ARB_texture_rectangle"))
         glExtensions |= TextureRectangle;
-    if (extensions.contains("GL_ARB_multisample"))
+    if (extensions.match("GL_ARB_multisample"))
         glExtensions |= SampleBuffers;
-    if (extensions.contains("GL_SGIS_generate_mipmap"))
+    if (extensions.match("GL_SGIS_generate_mipmap"))
         glExtensions |= GenerateMipmap;
-    if (extensions.contains("GL_ARB_texture_compression"))
+    if (extensions.match("GL_ARB_texture_compression"))
         glExtensions |= TextureCompression;
-    if (extensions.contains("GL_EXT_texture_compression_s3tc"))
+    if (extensions.match("GL_EXT_texture_compression_s3tc"))
         glExtensions |= DDSTextureCompression;
-    if (extensions.contains("GL_OES_compressed_ETC1_RGB8_texture"))
+    if (extensions.match("GL_OES_compressed_ETC1_RGB8_texture"))
         glExtensions |= ETC1TextureCompression;
-    if (extensions.contains("GL_IMG_texture_compression_pvrtc"))
+    if (extensions.match("GL_IMG_texture_compression_pvrtc"))
         glExtensions |= PVRTCTextureCompression;
-    if (extensions.contains("GL_ARB_fragment_program"))
+    if (extensions.match("GL_ARB_fragment_program"))
         glExtensions |= FragmentProgram;
-    if (extensions.contains("GL_ARB_fragment_shader"))
+    if (extensions.match("GL_ARB_fragment_shader"))
         glExtensions |= FragmentShader;
-    if (extensions.contains("GL_ARB_texture_mirrored_repeat"))
+    if (extensions.match("GL_ARB_texture_mirrored_repeat"))
         glExtensions |= MirroredRepeat;
-    if (extensions.contains("GL_EXT_framebuffer_object"))
+    if (extensions.match("GL_EXT_framebuffer_object"))
         glExtensions |= FramebufferObject;
-    if (extensions.contains("GL_EXT_stencil_two_side"))
+    if (extensions.match("GL_EXT_stencil_two_side"))
         glExtensions |= StencilTwoSide;
-    if (extensions.contains("GL_EXT_stencil_wrap"))
+    if (extensions.match("GL_EXT_stencil_wrap"))
         glExtensions |= StencilWrap;
-    if (extensions.contains("GL_EXT_packed_depth_stencil"))
+    if (extensions.match("GL_EXT_packed_depth_stencil"))
         glExtensions |= PackedDepthStencil;
-    if (extensions.contains("GL_NV_float_buffer"))
+    if (extensions.match("GL_NV_float_buffer"))
         glExtensions |= NVFloatBuffer;
-    if (extensions.contains("GL_ARB_pixel_buffer_object"))
+    if (extensions.match("GL_ARB_pixel_buffer_object"))
         glExtensions |= PixelBufferObject;
 #if defined(QT_OPENGL_ES_2)
     glExtensions |= FramebufferObject;
@@ -4862,26 +4886,26 @@ void QGLExtensions::init_extensions()
     glExtensions |= FragmentShader;
 #endif
 #if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
-    if (extensions.contains("GL_OES_framebuffer_object"))
+    if (extensions.match("GL_OES_framebuffer_object"))
         glExtensions |= FramebufferObject;
 #endif
 #if defined(QT_OPENGL_ES)
-    if (extensions.contains("GL_OES_packed_depth_stencil"))
+    if (extensions.match("GL_OES_packed_depth_stencil"))
         glExtensions |= PackedDepthStencil;
 #endif
-    if (extensions.contains("GL_ARB_framebuffer_object")) {
+    if (extensions.match("GL_ARB_framebuffer_object")) {
         // ARB_framebuffer_object also includes EXT_framebuffer_blit.
         glExtensions |= FramebufferObject;
         glExtensions |= FramebufferBlit;
     }
 
-    if (extensions.contains("GL_EXT_framebuffer_blit"))
+    if (extensions.match("GL_EXT_framebuffer_blit"))
         glExtensions |= FramebufferBlit;
 
-    if (extensions.contains("GL_ARB_texture_non_power_of_two"))
+    if (extensions.match("GL_ARB_texture_non_power_of_two"))
         glExtensions |= NPOTTextures;
 
-    if (extensions.contains("GL_EXT_bgra"))
+    if (extensions.match("GL_EXT_bgra"))
         glExtensions |= BGRATextureFormat;
 }
 
@@ -5363,11 +5387,12 @@ QSize QGLTexture::bindCompressedTexturePVR(const char *buf, int len)
     // Restore the default pixel alignment for later texture uploads.
     glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 
-    // Set the invert flag for the texture.
+    // Set the invert flag for the texture.  The "vertical flip"
+    // flag in PVR is the opposite sense to our sense of inversion.
     if ((pvrHeader->flags & PVR_VERTICAL_FLIP) != 0)
-        options |= QGLContext::InvertedYBindOption;
-    else
         options &= ~QGLContext::InvertedYBindOption;
+    else
+        options |= QGLContext::InvertedYBindOption;
 
     return QSize(pvrHeader->width, pvrHeader->height);
 }
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 079953f319..2076c46cd5 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -546,6 +546,7 @@ private:
     friend class QGLPixelBuffer;
     friend class QGLPixelBufferPrivate;
     friend class QGLContext;
+    friend class QGLContextPrivate;
     friend class QGLOverlayWidget;
     friend class QOpenGLPaintEngine;
     friend class QGLPaintDevice;
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index fbf034988a..839e8ebe84 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -142,19 +142,7 @@ void QGLContext::reset()
     d->cleanup();
     doneCurrent();
     if (d->eglContext) {
-        if (d->eglSurface != EGL_NO_SURFACE) {
-#ifdef Q_WS_X11
-            // Make sure we don't call eglDestroySurface on a surface which
-            // was created for a different winId:
-            if (d->paintDevice->devType() == QInternal::Widget) {
-                QGLWidget* w = static_cast<QGLWidget*>(d->paintDevice);
-
-                if (w->d_func()->eglSurfaceWindowId == w->winId())
-                    eglDestroySurface(d->eglContext->display(), d->eglSurface);
-            } else
-#endif
-                eglDestroySurface(d->eglContext->display(), d->eglSurface);
-        }
+        d->destroyEglSurfaceForDevice();
         delete d->eglContext;
     }
     d->eglContext = 0;
@@ -198,6 +186,26 @@ void QGLContext::swapBuffers() const
     d->eglContext->swapBuffers(d->eglSurface);
 }
 
+void QGLContextPrivate::destroyEglSurfaceForDevice()
+{
+    if (eglSurface != EGL_NO_SURFACE) {
+#ifdef Q_WS_X11
+        // Make sure we don't call eglDestroySurface on a surface which
+        // was created for a different winId:
+        if (paintDevice->devType() == QInternal::Widget) {
+            QGLWidget* w = static_cast<QGLWidget*>(paintDevice);
+
+            if (w->d_func()->eglSurfaceWindowId == w->winId())
+                eglDestroySurface(eglContext->display(), eglSurface);
+            else
+                qWarning("WARNING: Potential EGL surface leak!");
+        } else
+#endif
+            eglDestroySurface(eglContext->display(), eglSurface);
+        eglSurface = EGL_NO_SURFACE;
+    }
+}
+
 void QGLWidget::setMouseTracking(bool enable)
 {
     QWidget::setMouseTracking(enable);
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 179d69a51e..99c0f33058 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -133,9 +133,6 @@ public:
         : ref(1)
     {
         opts = QGL::DoubleBuffer | QGL::DepthBuffer | QGL::Rgba | QGL::DirectRendering | QGL::StencilBuffer;
-#if defined(QT_OPENGL_ES_2)
-        opts |= QGL::SampleBuffers;
-#endif
         pln = 0;
         depthSize = accumSize = stencilSize = redSize = greenSize = blueSize = alphaSize = -1;
         numSamples = -1;
@@ -291,6 +288,7 @@ public:
 #if defined(QT_OPENGL_ES)
     QEglContext *eglContext;
     EGLSurface eglSurface;
+    void destroyEglSurfaceForDevice();
 #elif defined(Q_WS_X11) || defined(Q_WS_MAC)
     void* cx;
 #endif
@@ -397,7 +395,7 @@ public:
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGLExtensions::Extensions)
 
 
-class Q_AUTOTEST_EXPORT QGLShareRegister
+class Q_OPENGL_EXPORT QGLShareRegister
 {
 public:
     QGLShareRegister() {}
@@ -613,6 +611,49 @@ private:
     friend class QGLContextGroup;
 };
 
+
+// This class can be used to match GL extensions with doing any mallocs. The
+// class assumes that the GL extension string ends with a space character,
+// which it should do on all conformant platforms. Create the object and pass
+// in a pointer to the extension string, then call match() on each extension
+// that should be matched. The match() function takes the extension name
+// *without* the terminating space character as input.
+
+class QGLExtensionMatcher
+{
+public:
+    QGLExtensionMatcher(const char *str)
+        : gl_extensions(str), gl_extensions_length(qstrlen(str))
+    {}
+
+    bool match(const char *str) {
+        int str_length = qstrlen(str);
+        const char *extensions = gl_extensions;
+        int extensions_length = gl_extensions_length;
+
+        while (1) {
+            // the total length that needs to be matched is the str_length +
+            // the space character that terminates the extension name
+            if (extensions_length < str_length + 1)
+                return false;
+            if (qstrncmp(extensions, str, str_length) == 0 && extensions[str_length] == ' ')
+                return true;
+
+            int split_pos = 0;
+            while (split_pos < extensions_length && extensions[split_pos] != ' ')
+                ++split_pos;
+            ++split_pos; // added for the terminating space character
+            extensions += split_pos;
+            extensions_length -= split_pos;
+        }
+        return false;
+    }
+
+private:
+    const char *gl_extensions;
+    int gl_extensions_length;
+};
+
 QT_END_NAMESPACE
 
 #endif // QGL_P_H
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index a037282f4f..9c3fc79f8b 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -343,8 +343,8 @@ void* qglx_getProcAddress(const char* procName)
     static bool triedResolvingGlxGetProcAddress = false;
     if (!triedResolvingGlxGetProcAddress) {
         triedResolvingGlxGetProcAddress = true;
-        QList<QByteArray> glxExt = QByteArray(glXGetClientString(QX11Info::display(), GLX_EXTENSIONS)).split(' ');
-        if (glxExt.contains("GLX_ARB_get_proc_address")) {
+        QGLExtensionMatcher extensions(glXGetClientString(QX11Info::display(), GLX_EXTENSIONS));
+        if (extensions.match("GLX_ARB_get_proc_address")) {
 #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
             void *handle = dlopen(NULL, RTLD_LAZY);
             if (handle) {
@@ -523,8 +523,8 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
         if (!d->gpm)
             return false;
     }
-    QList<QByteArray> glxExt = QByteArray(glXQueryExtensionsString(xinfo->display(), xinfo->screen())).split(' ');
-    if (glxExt.contains("GLX_SGI_video_sync")) {
+    QGLExtensionMatcher extensions(glXQueryExtensionsString(xinfo->display(), xinfo->screen()));
+    if (extensions.match("GLX_SGI_video_sync")) {
         if (d->glFormat.swapInterval() == -1)
             d->glFormat.setSwapInterval(0);
     } else {
@@ -630,8 +630,8 @@ void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth)
     static bool useTranspExt = false;
     static bool useTranspExtChecked = false;
     if (f.plane() && !useTranspExtChecked && d->paintDevice) {
-        QByteArray estr(glXQueryExtensionsString(xinfo->display(), xinfo->screen()));
-        useTranspExt = estr.contains("GLX_EXT_visual_info");
+        QGLExtensionMatcher extensions(glXQueryExtensionsString(xinfo->display(), xinfo->screen()));
+        useTranspExt = extensions.match("GLX_EXT_visual_info");
         //# (A bit simplistic; that could theoretically be a substring)
         if (useTranspExt) {
             QByteArray cstr(glXGetClientString(xinfo->display(), GLX_VENDOR));
@@ -875,8 +875,8 @@ void QGLContext::swapBuffers() const
             static bool resolved = false;
             if (!resolved) {
                 const QX11Info *xinfo = qt_x11Info(d->paintDevice);
-                QList<QByteArray> glxExt = QByteArray(glXQueryExtensionsString(xinfo->display(), xinfo->screen())).split(' ');
-                if (glxExt.contains("GLX_SGI_video_sync")) {
+                QGLExtensionMatcher extensions(glXQueryExtensionsString(xinfo->display(), xinfo->screen()));
+                if (extensions.match("GLX_SGI_video_sync")) {
                     glXGetVideoSyncSGI =  (qt_glXGetVideoSyncSGI)qglx_getProcAddress("glXGetVideoSyncSGI");
                     glXWaitVideoSyncSGI = (qt_glXWaitVideoSyncSGI)qglx_getProcAddress("glXWaitVideoSyncSGI");
                 }
@@ -1107,8 +1107,8 @@ void *QGLContext::getProcAddress(const QString &proc) const
     if (resolved && !glXGetProcAddressARB)
         return 0;
     if (!glXGetProcAddressARB) {
-        QList<QByteArray> glxExt = QByteArray(glXGetClientString(QX11Info::display(), GLX_EXTENSIONS)).split(' ');
-        if (glxExt.contains("GLX_ARB_get_proc_address")) {
+        QGLExtensionMatcher extensions(glXGetClientString(QX11Info::display(), GLX_EXTENSIONS));
+        if (extensions.match("GLX_ARB_get_proc_address")) {
 #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
             void *handle = dlopen(NULL, RTLD_LAZY);
             if (handle) {
@@ -1609,8 +1609,8 @@ static bool qt_resolveTextureFromPixmap(QPaintDevice *paintDevice)
             return false; // Can't use TFP without NPOT
         }
         const QX11Info *xinfo = qt_x11Info(paintDevice);
-        QList<QByteArray> glxExt = QByteArray(glXQueryExtensionsString(xinfo->display(), xinfo->screen())).split(' ');
-        if (glxExt.contains("GLX_EXT_texture_from_pixmap")) {
+        QGLExtensionMatcher extensions(glXQueryExtensionsString(xinfo->display(), xinfo->screen()));
+        if (extensions.match("GLX_EXT_texture_from_pixmap")) {
             glXBindTexImageEXT = (qt_glXBindTexImageEXT) qglx_getProcAddress("glXBindTexImageEXT");
             glXReleaseTexImageEXT = (qt_glXReleaseTexImageEXT) qglx_getProcAddress("glXReleaseTexImageEXT");
         }
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index a868e8302d..19026b3700 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -173,10 +173,16 @@ void QGLWidget::updateOverlayGL()
     //handle overlay
 }
 
+//#define QT_DEBUG_X11_VISUAL_SELECTION 1
+
 bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig config, const QX11Info &x11Info, bool useArgbVisual)
 {
     bool foundVisualIsArgb = useArgbVisual;
 
+#ifdef QT_DEBUG_X11_VISUAL_SELECTION
+    qDebug("qt_egl_setup_x11_visual() - useArgbVisual=%d", useArgbVisual);
+#endif
+
     memset(&vi, 0, sizeof(XVisualInfo));
 
     EGLint eglConfigColorSize;
@@ -199,7 +205,9 @@ bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig conf
                 XRenderPictFormat *format;
                 format = XRenderFindVisualFormat(x11Info.display(), chosenVisualInfo->visual);
                 if (format->type == PictTypeDirect && format->direct.alphaMask) {
-//                    qDebug("Using ARGB X Visual ID (%d) provided by EGL", (int)vi.visualid);
+#ifdef QT_DEBUG_X11_VISUAL_SELECTION
+                    qDebug("Using ARGB X Visual ID (%d) provided by EGL", (int)vi.visualid);
+#endif
                     foundVisualIsArgb = true;
                     vi = *chosenVisualInfo;
                 }
@@ -212,7 +220,9 @@ bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig conf
 #endif
             {
                 if (eglConfigColorSize == chosenVisualInfo->depth) {
-//                    qDebug("Using opaque X Visual ID (%d) provided by EGL", (int)vi.visualid);
+#ifdef QT_DEBUG_X11_VISUAL_SELECTION
+                    qDebug("Using opaque X Visual ID (%d) provided by EGL", (int)vi.visualid);
+#endif
                     vi = *chosenVisualInfo;
                 } else
                     qWarning("Warning: EGL suggested using X visual ID %d (%d bpp) for config %d (%d bpp), but the depths do not match!",
@@ -248,7 +258,9 @@ bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig conf
             if (format->type == PictTypeDirect && format->direct.alphaMask) {
                 vi = matchingVisuals[i];
                 foundVisualIsArgb = true;
-//                qDebug("Using X Visual ID (%d) for ARGB visual as provided by XRender", (int)vi.visualid);
+#ifdef QT_DEBUG_X11_VISUAL_SELECTION
+                qDebug("Using X Visual ID (%d) for ARGB visual as provided by XRender", (int)vi.visualid);
+#endif
                 break;
             }
         }
@@ -272,24 +284,28 @@ bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig conf
             } else
                 qWarning("         - Falling back to X11 suggested depth (%d)", depth);
         }
-//        else
-//            qDebug("Using X Visual ID (%d) for EGL provided depth (%d)", (int)vi.visualid, depth);
+#ifdef QT_DEBUG_X11_VISUAL_SELECTION
+        else
+            qDebug("Using X Visual ID (%d) for EGL provided depth (%d)", (int)vi.visualid, depth);
+#endif
 
         // Don't try to use ARGB now unless the visual is 32-bit - even then it might stil fail :-(
         if (useArgbVisual)
             foundVisualIsArgb = vi.depth == 32; //### We might at some point (soon) get ARGB4444
     }
 
-//    qDebug("Visual Info:");
-//    qDebug("   bits_per_rgb=%d", vi.bits_per_rgb);
-//    qDebug("   red_mask=0x%x", vi.red_mask);
-//    qDebug("   green_mask=0x%x", vi.green_mask);
-//    qDebug("   blue_mask=0x%x", vi.blue_mask);
-//    qDebug("   colormap_size=%d", vi.colormap_size);
-//    qDebug("   c_class=%d", vi.c_class);
-//    qDebug("   depth=%d", vi.depth);
-//    qDebug("   screen=%d", vi.screen);
-//    qDebug("   visualid=%d", vi.visualid);
+#ifdef QT_DEBUG_X11_VISUAL_SELECTION
+    qDebug("Visual Info:");
+    qDebug("   bits_per_rgb=%d", vi.bits_per_rgb);
+    qDebug("   red_mask=0x%x", vi.red_mask);
+    qDebug("   green_mask=0x%x", vi.green_mask);
+    qDebug("   blue_mask=0x%x", vi.blue_mask);
+    qDebug("   colormap_size=%d", vi.colormap_size);
+    qDebug("   c_class=%d", vi.c_class);
+    qDebug("   depth=%d", vi.depth);
+    qDebug("   screen=%d", vi.screen);
+    qDebug("   visualid=%d", vi.visualid);
+#endif
     return foundVisualIsArgb;
 }
 
@@ -320,7 +336,7 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext,
     // If the application has set WA_TranslucentBackground and not explicitly set
     // the alpha buffer size to zero, modify the format so it have an alpha channel
     QGLFormat& fmt = d->glcx->d_func()->glFormat;
-    const bool tryArgbVisual = testAttribute(Qt::WA_TranslucentBackground);
+    const bool tryArgbVisual = testAttribute(Qt::WA_TranslucentBackground) || fmt.alpha();
     if (tryArgbVisual && fmt.alphaBufferSize() == -1)
         fmt.setAlphaBufferSize(1);
 
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index d0297c98f2..4b5c30afc3 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -597,6 +597,12 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
     the constructors that take a QGLFramebufferObject parameter, and set the
     QGLFramebufferObject::samples() property to a non-zero value.
 
+    When painting to a QGLFramebufferObject using QPainter, the state of
+    the current GL context will be altered by the paint engine to reflect
+    its needs.  Applications should not rely upon the GL state being reset
+    to its original conditions, particularly the current shader program,
+    GL viewport, texture units, and drawing modes.
+
     For multisample framebuffer objects a color render buffer is created,
     otherwise a texture with the specified texture target is created.
     The color render buffer or texture will have the specified internal
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp
index c478630554..d4bcbe9013 100644
--- a/src/opengl/qglpixmapfilter.cpp
+++ b/src/opengl/qglpixmapfilter.cpp
@@ -55,11 +55,17 @@
 #include "qgl_p.h"
 
 #include "private/qapplication_p.h"
+#include "private/qdrawhelper_p.h"
+#include "private/qmemrotate_p.h"
 #include "private/qmath_p.h"
 #include "qmath.h"
 
 QT_BEGIN_NAMESPACE
 
+// qpixmapfilter.cpp
+void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0);
+QImage qt_halfScaled(const QImage &source);
+
 void QGLPixmapFilterBase::bindTexture(const QPixmap &src) const
 {
     const_cast<QGLContext *>(QGLContext::currentContext())->d_func()->bindTexture(src, GL_TEXTURE_2D, GL_RGBA, QGLContext::BindOptions(QGLContext::DefaultBindOption | QGLContext::MemoryManagedBindOption));
@@ -102,48 +108,21 @@ private:
 class QGLPixmapBlurFilter : public QGLCustomShaderStage, public QGLPixmapFilter<QPixmapBlurFilter>
 {
 public:
-    QGLPixmapBlurFilter(QGraphicsBlurEffect::BlurHints hints);
-
-    void setUniforms(QGLShaderProgram *program);
-
-    static QByteArray generateGaussianShader(int radius, bool singlePass = false, bool dropShadow = false);
+    QGLPixmapBlurFilter();
 
 protected:
     bool processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &srcRect) const;
-
-private:
-
-    mutable QSize m_textureSize;
-    mutable bool m_horizontalBlur;
-    mutable bool m_singlePass;
-    mutable bool m_animatedBlur;
-
-    mutable qreal m_t;
-    mutable QSize m_targetSize;
-
-    mutable bool m_haveCached;
-    mutable int m_cachedRadius;
-    mutable QGraphicsBlurEffect::BlurHints m_hints;
 };
 
 class QGLPixmapDropShadowFilter : public QGLCustomShaderStage, public QGLPixmapFilter<QPixmapDropShadowFilter>
 {
 public:
-    QGLPixmapDropShadowFilter(QGraphicsBlurEffect::BlurHints hints);
+    QGLPixmapDropShadowFilter();
 
     void setUniforms(QGLShaderProgram *program);
 
 protected:
     bool processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &srcRect) const;
-
-private:
-    mutable QSize m_textureSize;
-    mutable bool m_horizontalBlur;
-    mutable bool m_singlePass;
-
-    mutable bool m_haveCached;
-    mutable int m_cachedRadius;
-    mutable QGraphicsBlurEffect::BlurHints m_hints;
 };
 
 extern QGLWidget *qt_gl_share_widget();
@@ -158,31 +137,14 @@ QPixmapFilter *QGL2PaintEngineEx::pixmapFilter(int type, const QPixmapFilter *pr
         return d->colorizeFilter.data();
 
     case QPixmapFilter::BlurFilter: {
-        const QPixmapBlurFilter *proto = static_cast<const QPixmapBlurFilter *>(prototype);
-        if (proto->blurHints() & QGraphicsBlurEffect::AnimationHint) {
-            if (!d->animationBlurFilter)
-                d->animationBlurFilter.reset(new QGLPixmapBlurFilter(proto->blurHints()));
-            return d->animationBlurFilter.data();
-        }
-        if ((proto->blurHints() & QGraphicsBlurEffect::QualityHint) && proto->radius() > 5) {
-            if (!d->blurFilter)
-                d->blurFilter.reset(new QGLPixmapBlurFilter(QGraphicsBlurEffect::QualityHint));
-            return d->blurFilter.data();
-        }
-        if (!d->fastBlurFilter)
-            d->fastBlurFilter.reset(new QGLPixmapBlurFilter(QGraphicsBlurEffect::PerformanceHint));
-        return d->fastBlurFilter.data();
+        if (!d->blurFilter)
+            d->blurFilter.reset(new QGLPixmapBlurFilter());
+        return d->blurFilter.data();
         }
 
     case QPixmapFilter::DropShadowFilter: {
-        const QPixmapDropShadowFilter *proto = static_cast<const QPixmapDropShadowFilter *>(prototype);
-        if (proto->blurRadius() <= 5) {
-            if (!d->fastDropShadowFilter)
-                d->fastDropShadowFilter.reset(new QGLPixmapDropShadowFilter(QGraphicsBlurEffect::PerformanceHint));
-            return d->fastDropShadowFilter.data();
-        }
         if (!d->dropShadowFilter)
-            d->dropShadowFilter.reset(new QGLPixmapDropShadowFilter(QGraphicsBlurEffect::QualityHint));
+            d->dropShadowFilter.reset(new QGLPixmapDropShadowFilter());
         return d->dropShadowFilter.data();
         }
 
@@ -311,59 +273,43 @@ bool QGLPixmapConvolutionFilter::processGL(QPainter *painter, const QPointF &pos
     return true;
 }
 
-static const char *qt_gl_texture_sampling_helper =
-    "lowp float texture2DAlpha(lowp sampler2D src, highp vec2 srcCoords) {\n"
-    "   return texture2D(src, srcCoords).a;\n"
-    "}\n";
-
-QGLPixmapBlurFilter::QGLPixmapBlurFilter(QGraphicsBlurEffect::BlurHints hints)
-    : m_animatedBlur(false)
-    , m_haveCached(false)
-    , m_cachedRadius(0)
-    , m_hints(hints)
-{
-}
-
-// should be even numbers as they will be divided by two
-static const int qCachedBlurLevels[] = { 6, 14, 30 };
-static const int qNumCachedBlurTextures = sizeof(qCachedBlurLevels) / sizeof(*qCachedBlurLevels);
-static const int qMaxCachedBlurLevel = qCachedBlurLevels[qNumCachedBlurTextures - 1];
-
-static qreal qLogBlurLevel(int level)
+QGLPixmapBlurFilter::QGLPixmapBlurFilter()
 {
-    static bool initialized = false;
-    static qreal logBlurLevelCache[qNumCachedBlurTextures];
-    if (!initialized) {
-        for (int i = 0; i < qNumCachedBlurTextures; ++i)
-            logBlurLevelCache[i] = qLn(qCachedBlurLevels[i]);
-        initialized = true;
-    }
-    return logBlurLevelCache[level];
 }
 
 class QGLBlurTextureInfo
 {
 public:
-    QGLBlurTextureInfo(QSize size, GLuint textureIds[])
-        : m_size(size)
+    QGLBlurTextureInfo(const QImage &image, GLuint tex, qreal r)
+        : m_texture(tex)
+        , m_radius(r)
     {
-        for (int i = 0; i < qNumCachedBlurTextures; ++i)
-            m_textureIds[i] = textureIds[i];
+        m_paddedImage << image;
     }
 
     ~QGLBlurTextureInfo()
     {
-        glDeleteTextures(qNumCachedBlurTextures, m_textureIds);
+        glDeleteTextures(1, &m_texture);
     }
 
-    QSize size() const { return m_size; }
-    GLuint textureId(int i) const { return m_textureIds[i]; }
+    QImage paddedImage(int scaleLevel = 0) const;
+    GLuint texture() const { return m_texture; }
+    qreal radius() const { return m_radius; }
 
 private:
-    GLuint m_textureIds[qNumCachedBlurTextures];
-    QSize m_size;
+    mutable QList<QImage> m_paddedImage;
+    GLuint m_texture;
+    qreal m_radius;
 };
 
+QImage QGLBlurTextureInfo::paddedImage(int scaleLevel) const
+{
+    for (int i = m_paddedImage.size() - 1; i <= scaleLevel; ++i)
+        m_paddedImage << qt_halfScaled(m_paddedImage.at(i));
+
+    return m_paddedImage.at(scaleLevel);
+}
+
 class QGLBlurTextureCache : public QObject
 {
 public:
@@ -373,7 +319,6 @@ public:
     ~QGLBlurTextureCache();
 
     QGLBlurTextureInfo *takeBlurTextureInfo(const QPixmap &pixmap);
-    bool fitsInCache(const QPixmap &pixmap) const;
     bool hasBlurTextureInfo(const QPixmap &pixmap) const;
     void insertBlurTextureInfo(const QPixmap &pixmap, QGLBlurTextureInfo *info);
     void clearBlurTextureInfo(const QPixmap &pixmap);
@@ -458,12 +403,7 @@ void QGLBlurTextureCache::insertBlurTextureInfo(const QPixmap &pixmap, QGLBlurTe
     if (timerId)
         killTimer(timerId);
 
-    timerId = startTimer(1000);
-}
-
-bool QGLBlurTextureCache::fitsInCache(const QPixmap &pixmap) const
-{
-    return pixmap.width() * pixmap.height() <= cache.maxCost();
+    timerId = startTimer(8000);
 }
 
 void QGLBlurTextureCache::pixmapDestroyed(QPixmap *pixmap)
@@ -474,567 +414,217 @@ void QGLBlurTextureCache::pixmapDestroyed(QPixmap *pixmap)
     }
 }
 
-static const char *qt_gl_interpolate_filter =
-        "uniform lowp float interpolationValue;"
-        "uniform lowp sampler2D interpolateTarget;"
-        "uniform highp vec4 interpolateMapping;"
-        "lowp vec4 customShader(lowp sampler2D src, highp vec2 srcCoords)"
-        "{"
-        "    return mix(texture2D(interpolateTarget, interpolateMapping.xy + interpolateMapping.zw * srcCoords),"
-        "               texture2D(src, srcCoords), interpolationValue);"
-        "}";
+static const int qAnimatedBlurLevelIncrement = 16;
+static const int qMaxBlurHalfScaleLevel = 1;
 
-static void initializeTexture(GLuint id, int width, int height)
+static GLuint generateBlurTexture(const QSize &size, GLenum format = GL_RGBA)
 {
-    glBindTexture(GL_TEXTURE_2D, id);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
-                 GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glBindTexture(GL_TEXTURE_2D, 0);
+    GLuint texture;
+    glGenTextures(1, &texture);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, format, size.width(), size.height(), 0, format,
+                 GL_UNSIGNED_BYTE, 0);
+    return texture;
 }
 
-bool QGLPixmapBlurFilter::processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &) const
+static inline uint nextMultiple(uint x, uint multiplier)
 {
-    QGLPixmapBlurFilter *filter = const_cast<QGLPixmapBlurFilter *>(this);
-
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-    QGLBlurTextureCache *blurTextureCache = QGLBlurTextureCache::cacheForContext(ctx);
-
-    if ((m_hints & QGraphicsBlurEffect::AnimationHint) && blurTextureCache->fitsInCache(src)) {
-        QRect targetRect = src.rect().adjusted(-qMaxCachedBlurLevel, -qMaxCachedBlurLevel, qMaxCachedBlurLevel, qMaxCachedBlurLevel);
-        // ensure even dimensions (going to divide by two)
-        targetRect.setWidth((targetRect.width() + 1) & ~1);
-        targetRect.setHeight((targetRect.height() + 1) & ~1);
-
-        QGLBlurTextureInfo *info = 0;
-        if (blurTextureCache->hasBlurTextureInfo(src)) {
-            info = blurTextureCache->takeBlurTextureInfo(src);
-        } else {
-            m_animatedBlur = false;
-            m_hints = QGraphicsBlurEffect::QualityHint;
-            m_singlePass = false;
-
-            QGLFramebufferObjectFormat format;
-            format.setInternalTextureFormat(GLenum(GL_RGBA));
-            QGLFramebufferObject *fbo = qgl_fbo_pool()->acquire(targetRect.size() / 2, format, true);
-
-            if (!fbo)
-                return false;
-
-            QPainter fboPainter(fbo);
-            QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(fboPainter.paintEngine());
-
-            glClearColor(0, 0, 0, 0);
-            glClear(GL_COLOR_BUFFER_BIT);
-
-            // ensure GL_LINEAR filtering is used for scaling down to half the size
-            fboPainter.setRenderHint(QPainter::SmoothPixmapTransform);
-            fboPainter.setCompositionMode(QPainter::CompositionMode_Source);
-            fboPainter.drawPixmap(qMaxCachedBlurLevel / 2, qMaxCachedBlurLevel / 2,
-                    targetRect.width() / 2 - qMaxCachedBlurLevel, targetRect.height() / 2 - qMaxCachedBlurLevel, src);
-
-            GLuint textures[qNumCachedBlurTextures]; // blur textures
-            glGenTextures(qNumCachedBlurTextures, textures);
-            GLuint temp; // temp texture
-            glGenTextures(1, &temp);
-
-            initializeTexture(temp, fbo->width(), fbo->height());
-            m_textureSize = fbo->size();
-
-            int currentBlur = 0;
-
-            QRect fboRect(0, 0, fbo->width(), fbo->height());
-            GLuint sourceTexture = fbo->texture();
-            for (int i = 0; i < qNumCachedBlurTextures; ++i) {
-                int targetBlur = qCachedBlurLevels[i] / 2;
-
-                int blurDelta = qRound(qSqrt(targetBlur * targetBlur - currentBlur * currentBlur));
-                QByteArray source = generateGaussianShader(blurDelta);
-                filter->setSource(source);
-
-                currentBlur = targetBlur;
-
-                // now we're going to be nasty and keep using the same FBO with different textures
-                glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-                        GL_TEXTURE_2D, temp, 0);
-
-                m_horizontalBlur = true;
-                filter->setOnPainter(&fboPainter);
-                engine->drawTexture(fboRect, sourceTexture, fbo->size(), fboRect);
-                filter->removeFromPainter(&fboPainter);
-
-                sourceTexture = textures[i];
-                initializeTexture(sourceTexture, fbo->width(), fbo->height());
-
-                glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-                        GL_TEXTURE_2D, textures[i], 0);
-
-                m_horizontalBlur = false;
-                filter->setOnPainter(&fboPainter);
-                engine->drawTexture(fboRect, temp, fbo->size(), fboRect);
-                filter->removeFromPainter(&fboPainter);
-            }
-
-            glDeleteTextures(1, &temp);
+    uint mod = x % multiplier;
+    if (mod == 0)
+        return x;
+    return x + multiplier - mod;
+}
 
-            // reattach the original FBO texture
-            glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-                    GL_TEXTURE_2D, fbo->texture(), 0);
+void qt_memrotate90_gl(const quint32 *src, int srcWidth, int srcHeight, int srcStride,
+                       quint32 *dest, int dstStride);
 
-            fboPainter.end();
+bool QGLPixmapBlurFilter::processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &) const
+{
+    if (radius() < 1) {
+        painter->drawPixmap(pos, src);
+        return true;
+    }
 
-            qgl_fbo_pool()->release(fbo);
+    qreal actualRadius = radius();
 
-            info = new QGLBlurTextureInfo(fboRect.size(), textures);
-        }
+    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
 
-        if (!m_haveCached || !m_animatedBlur) {
-            m_haveCached = true;
-            m_animatedBlur = true;
-            m_hints = QGraphicsBlurEffect::AnimationHint;
-            filter->setSource(qt_gl_interpolate_filter);
-        }
+    QGLBlurTextureCache *blurTextureCache = QGLBlurTextureCache::cacheForContext(ctx);
+    QGLBlurTextureInfo *info = 0;
+    int padding = nextMultiple(qCeil(actualRadius), qAnimatedBlurLevelIncrement);
+    QRect targetRect = src.rect().adjusted(-padding, -padding, padding, padding);
 
-        QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(painter->paintEngine());
-        painter->setRenderHint(QPainter::SmoothPixmapTransform);
-        filter->setOnPainter(painter);
+    // pad so that we'll be able to half-scale qMaxBlurHalfScaleLevel times
+    targetRect.setWidth((targetRect.width() + (qMaxBlurHalfScaleLevel-1)) & ~(qMaxBlurHalfScaleLevel-1));
+    targetRect.setHeight((targetRect.height() + (qMaxBlurHalfScaleLevel-1)) & ~(qMaxBlurHalfScaleLevel-1));
 
-        qreal logRadius = qLn(radius());
+    QSize textureSize;
 
-        int t;
-        for (t = -1; t < qNumCachedBlurTextures - 2; ++t) {
-            if (logRadius < qLogBlurLevel(t+1))
-                break;
-        }
+    info = blurTextureCache->takeBlurTextureInfo(src);
+    if (!info || info->radius() < actualRadius) {
+        QSize paddedSize = targetRect.size() / 2;
 
-        qreal logBase = t >= 0 ? qLogBlurLevel(t) : 0;
-        m_t = qBound(qreal(0), (logRadius - logBase) / (qLogBlurLevel(t+1) - logBase), qreal(1));
+        QImage padded(paddedSize.height(), paddedSize.width(), QImage::Format_ARGB32_Premultiplied);
+        padded.fill(0);
 
-        m_textureSize = info->size();
+        if (info) {
+            int oldPadding = qRound(info->radius());
 
-        glActiveTexture(GL_TEXTURE0 + 3);
-        if (t >= 0) {
-            glBindTexture(GL_TEXTURE_2D, info->textureId(t));
-            m_targetSize = info->size();
+            QPainter p(&padded);
+            p.setCompositionMode(QPainter::CompositionMode_Source);
+            p.drawImage((padding - oldPadding) / 2, (padding - oldPadding) / 2, info->paddedImage());
+            p.end();
         } else {
-            QGLTexture *texture =
-                ctx->d_func()->bindTexture(src, GL_TEXTURE_2D, GL_RGBA,
-                                           QGLContext::InternalBindOption
-                                           | QGLContext::CanFlipNativePixmapBindOption);
-            m_targetSize = src.size();
-            if (!(texture->options & QGLContext::InvertedYBindOption))
-                m_targetSize.setHeight(-m_targetSize.height());
+            // TODO: combine byteswapping and memrotating into one by declaring
+            // custom GL_RGBA pixel type and qt_colorConvert template for it
+            QImage prepadded = qt_halfScaled(src.toImage()).convertToFormat(QImage::Format_ARGB32_Premultiplied);
+
+            // byte-swap and memrotates in one go
+            qt_memrotate90_gl(reinterpret_cast<const quint32*>(prepadded.bits()),
+                              prepadded.width(), prepadded.height(), prepadded.bytesPerLine(),
+                              reinterpret_cast<quint32*>(padded.scanLine(padding / 2)) + padding / 2,
+                              padded.bytesPerLine());
         }
 
-        // restrict the target rect to the max of the radii we are interpolating between
-        int radiusDelta = qMaxCachedBlurLevel - qCachedBlurLevels[t+1];
-        targetRect = targetRect.translated(pos.toPoint()).adjusted(radiusDelta, radiusDelta, -radiusDelta, -radiusDelta);
-
-        radiusDelta /= 2;
-        QRect sourceRect = QRect(QPoint(), m_textureSize).adjusted(radiusDelta, radiusDelta, -radiusDelta, -radiusDelta);
-
-        engine->drawTexture(targetRect, info->textureId(t+1), m_textureSize, sourceRect);
-
-        glActiveTexture(GL_TEXTURE0 + 3);
-        glBindTexture(GL_TEXTURE_2D, 0);
-
-        filter->removeFromPainter(painter);
-        blurTextureCache->insertBlurTextureInfo(src, info);
-
-        return true;
-    }
+        delete info;
+        info = new QGLBlurTextureInfo(padded, generateBlurTexture(paddedSize), padding);
 
-    if (blurTextureCache->hasBlurTextureInfo(src))
-        blurTextureCache->clearBlurTextureInfo(src);
-
-    int actualRadius = qRound(radius());
-    int filterRadius = actualRadius;
-    int fastRadii[] = { 1, 2, 3, 5, 8, 15, 25 };
-    if (!(m_hints & QGraphicsBlurEffect::QualityHint)) {
-        uint i = 0;
-        for (; i < (sizeof(fastRadii)/sizeof(*fastRadii))-1; ++i) {
-            if (fastRadii[i+1] > filterRadius)
-                break;
-        }
-        filterRadius = fastRadii[i];
+        textureSize = paddedSize;
+    } else {
+        textureSize = QSize(info->paddedImage().height(), info->paddedImage().width());
     }
 
-    m_singlePass = filterRadius <= 3;
-
-    if (!m_haveCached || m_animatedBlur || filterRadius != m_cachedRadius) {
-        // Only regenerate the shader from source if parameters have changed.
-        m_haveCached = true;
-        m_animatedBlur = false;
-        m_cachedRadius = filterRadius;
-        QByteArray source = generateGaussianShader(filterRadius, m_singlePass);
-        filter->setSource(source);
+    actualRadius *= qreal(0.5);
+    int level = 1;
+    for (; level < qMaxBlurHalfScaleLevel; ++level) {
+        if (actualRadius <= 16)
+            break;
+        actualRadius *= qreal(0.5);
     }
 
-    QRect targetRect = QRectF(src.rect()).translated(pos).adjusted(-actualRadius, -actualRadius, actualRadius, actualRadius).toAlignedRect();
+    const int s = (1 << level);
 
-    if (m_singlePass) {
-        // prepare for updateUniforms
-        m_textureSize = src.size();
+    int prepadding = qRound(info->radius());
+    padding = qMin(prepadding, qCeil(actualRadius) << level);
+    targetRect = src.rect().adjusted(-padding, -padding, padding, padding);
 
-        // ensure GL_LINEAR filtering is used
-        painter->setRenderHint(QPainter::SmoothPixmapTransform);
-        filter->setOnPainter(painter);
-        QBrush pixmapBrush = src;
-        pixmapBrush.setTransform(QTransform::fromTranslate(pos.x(), pos.y()));
-        painter->fillRect(targetRect, pixmapBrush);
-        filter->removeFromPainter(painter);
-    } else {
-        QGLFramebufferObjectFormat format;
-        format.setInternalTextureFormat(GLenum(src.hasAlphaChannel() ? GL_RGBA : GL_RGB));
-        QGLFramebufferObject *fbo = qgl_fbo_pool()->acquire(targetRect.size(), format);
+    targetRect.setWidth(targetRect.width() & ~(s-1));
+    targetRect.setHeight(targetRect.height() & ~(s-1));
 
-        if (!fbo)
-            return false;
+    int paddingDelta = (prepadding - padding) >> level;
 
-        // prepare for updateUniforms
-        m_textureSize = src.size();
+    QRect subRect(paddingDelta, paddingDelta, targetRect.width() >> level, targetRect.height() >> level);
+    QImage sourceImage = info->paddedImage(level-1);
 
-        // horizontal pass, to pixmap
-        m_horizontalBlur = true;
+    QImage subImage(subRect.height(), subRect.width(), QImage::Format_ARGB32_Premultiplied);
+    qt_rectcopy((QRgb *)subImage.bits(), ((QRgb *)sourceImage.scanLine(paddingDelta)) + paddingDelta,
+                0, 0, subRect.height(), subRect.width(), subImage.bytesPerLine(), sourceImage.bytesPerLine());
 
-        QPainter fboPainter(fbo);
+    GLuint texture = info->texture();
 
-        glClearColor(0, 0, 0, 0);
-        glClear(GL_COLOR_BUFFER_BIT);
+    qt_blurImage(subImage, actualRadius, blurHints() & QGraphicsBlurEffect::QualityHint, 1);
 
-        // ensure GL_LINEAR filtering is used
-        fboPainter.setRenderHint(QPainter::SmoothPixmapTransform);
-        fboPainter.setCompositionMode(QPainter::CompositionMode_Source);
-        filter->setOnPainter(&fboPainter);
-        QBrush pixmapBrush = src;
-        pixmapBrush.setTransform(QTransform::fromTranslate(actualRadius, actualRadius));
-        fboPainter.fillRect(QRect(0, 0, targetRect.width(), targetRect.height()), pixmapBrush);
-        filter->removeFromPainter(&fboPainter);
-        fboPainter.end();
+    // subtract one pixel off the end to prevent the bilinear sampling from sampling uninitialized data
+    QRect textureSubRect = subImage.rect().adjusted(0, 0, -1, -1);
+    QRectF targetRectF = QRectF(targetRect).adjusted(0, 0, -targetRect.width() / qreal(textureSize.width()), -targetRect.height() / qreal(textureSize.height()));
 
-        QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(painter->paintEngine());
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, subImage.width(), subImage.height(), GL_RGBA,
+            GL_UNSIGNED_BYTE, const_cast<const QImage &>(subImage).bits());
 
-        // vertical pass, to painter
-        m_horizontalBlur = false;
-        m_textureSize = fbo->size();
+    QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(painter->paintEngine());
+    painter->setRenderHint(QPainter::SmoothPixmapTransform);
 
-        painter->save();
-        // ensure GL_LINEAR filtering is used
-        painter->setRenderHint(QPainter::SmoothPixmapTransform);
-        filter->setOnPainter(painter);
-        engine->drawTexture(targetRect, fbo->texture(), fbo->size(), QRect(QPoint(), targetRect.size()).translated(0, fbo->height() - targetRect.height()));
-        filter->removeFromPainter(painter);
-        painter->restore();
+    // texture is flipped on the y-axis
+    targetRectF = QRectF(targetRectF.x(), targetRectF.bottom(), targetRectF.width(), -targetRectF.height());
+    engine->drawTexture(targetRectF.translated(pos), texture, textureSize, textureSubRect);
 
-        qgl_fbo_pool()->release(fbo);
-    }
+    blurTextureCache->insertBlurTextureInfo(src, info);
 
     return true;
 }
 
-void QGLPixmapBlurFilter::setUniforms(QGLShaderProgram *program)
-{
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-    if (m_animatedBlur) {
-        program->setUniformValue("interpolateTarget", 3);
-        program->setUniformValue("interpolationValue", GLfloat(m_t));
-
-        if (m_textureSize == m_targetSize) {
-            program->setUniformValue("interpolateMapping", 0.0f, 0.0f, 1.0f, 1.0f);
-        } else {
-            float offsetX = (-qMaxCachedBlurLevel - 0.5) / qreal(m_targetSize.width());
-            float offsetY = (-qMaxCachedBlurLevel - 0.5) / qreal(m_targetSize.height());
-
-            if (m_targetSize.height() < 0)
-                offsetY = 1 + offsetY;
-
-            float scaleX = 2.0f * qreal(m_textureSize.width()) / qreal(m_targetSize.width());
-            float scaleY = 2.0f * qreal(m_textureSize.height()) / qreal(m_targetSize.height());
-
-            program->setUniformValue("interpolateMapping", offsetX, offsetY, scaleX, scaleY);
-        }
-
-        return;
-    }
+static const char *qt_gl_drop_shadow_filter =
+        "uniform lowp vec4 shadowColor;"
+        "lowp vec4 customShader(lowp sampler2D src, highp vec2 srcCoords)"
+        "{"
+        "    return shadowColor * texture2D(src, srcCoords.yx).a;"
+        "}";
 
-    if (m_hints & QGraphicsBlurEffect::QualityHint) {
-        if (m_singlePass)
-            program->setUniformValue("delta", 1.0 / m_textureSize.width(), 1.0 / m_textureSize.height());
-        else if (m_horizontalBlur)
-            program->setUniformValue("delta", 1.0 / m_textureSize.width(), 0.0);
-        else
-            program->setUniformValue("delta", 0.0, 1.0 / m_textureSize.height());
-    } else {
-        qreal blur = radius() / qreal(m_cachedRadius);
-
-        if (m_singlePass)
-            program->setUniformValue("delta", blur / m_textureSize.width(), blur / m_textureSize.height());
-        else if (m_horizontalBlur)
-            program->setUniformValue("delta", blur / m_textureSize.width(), 0.0);
-        else
-            program->setUniformValue("delta", 0.0, blur / m_textureSize.height());
-    }
-}
 
-static inline qreal gaussian(qreal dx, qreal sigma)
+QGLPixmapDropShadowFilter::QGLPixmapDropShadowFilter()
 {
-    return exp(-dx * dx / (2 * sigma * sigma)) / (Q_2PI * sigma * sigma);
+    setSource(qt_gl_drop_shadow_filter);
 }
 
-QByteArray QGLPixmapBlurFilter::generateGaussianShader(int radius, bool singlePass, bool dropShadow)
+bool QGLPixmapDropShadowFilter::processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &srcRect) const
 {
-    Q_ASSERT(radius >= 1);
-
-    radius = qMin(127, radius);
-
-    static QCache<uint, QByteArray> shaderSourceCache;
-    uint key = radius | (int(singlePass) << 7) | (int(dropShadow) << 8);
-    QByteArray *cached = shaderSourceCache.object(key);
-    if (cached)
-        return *cached;
-
-    QByteArray source;
-    source.reserve(1000);
-    source.append(qt_gl_texture_sampling_helper);
-
-    source.append("uniform highp vec2      delta;\n");
-    if (dropShadow)
-        source.append("uniform mediump vec4    shadowColor;\n");
-    source.append("lowp vec4 customShader(lowp sampler2D src, highp vec2 srcCoords) {\n");
-
-    QVector<qreal> sampleOffsets;
-    QVector<qreal> weights;
-
-    QVector<qreal> gaussianComponents;
-
-    qreal sigma = radius / 1.65;
-
-    qreal sum = 0;
-    for (int i = -radius; i < radius; ++i) {
-        float value = gaussian(i, sigma);
-        gaussianComponents << value;
-        sum += value;
-    }
-
-    // normalize
-    for (int i = 0; i < gaussianComponents.size(); ++i)
-        gaussianComponents[i] /= sum;
-
-    for (int i = 0; i < gaussianComponents.size() - 1; i += 2) {
-        qreal weight = gaussianComponents.at(i) + gaussianComponents.at(i + 1);
-        qreal offset = i - radius + gaussianComponents.at(i + 1) / weight;
-
-        sampleOffsets << offset;
-        weights << weight;
-    }
-
-    int limit = sampleOffsets.size();
-    if (singlePass)
-        limit *= limit;
-
-    QByteArray baseCoordinate = "srcCoords";
-
-    for (int i = 0; i < limit; ++i) {
-        QByteArray coordinate = baseCoordinate;
-
-        qreal weight;
-        if (singlePass) {
-            const int xIndex = i % sampleOffsets.size();
-            const int yIndex = i / sampleOffsets.size();
-
-            const qreal deltaX = sampleOffsets.at(xIndex);
-            const qreal deltaY = sampleOffsets.at(yIndex);
-            weight = weights.at(xIndex) * weights.at(yIndex);
-
-            if (!qFuzzyCompare(deltaX, deltaY)) {
-                coordinate.append(" + vec2(delta.x * float(");
-                coordinate.append(QByteArray::number(deltaX));
-                coordinate.append("), delta.y * float(");
-                coordinate.append(QByteArray::number(deltaY));
-                coordinate.append("))");
-            } else if (!qFuzzyIsNull(deltaX)) {
-                coordinate.append(" + delta * float(");
-                coordinate.append(QByteArray::number(deltaX));
-                coordinate.append(")");
-            }
-        } else {
-            const qreal delta = sampleOffsets.at(i);
-            weight = weights.at(i);
-            if (!qFuzzyIsNull(delta)) {
-                coordinate.append(" + delta * float(");
-                coordinate.append(QByteArray::number(delta));
-                coordinate.append(")");
-            }
-        }
-
-        if (i == 0) {
-            if (dropShadow)
-                source.append("    mediump float sample = ");
-            else
-                source.append("    mediump vec4 sample = ");
-        } else {
-            if (dropShadow)
-                source.append("    sample += ");
-            else
-                source.append("    sample += ");
-        }
+    QGLPixmapDropShadowFilter *filter = const_cast<QGLPixmapDropShadowFilter *>(this);
 
-        source.append("texture2D(src, ");
-        source.append(coordinate);
-        source.append(")");
+    qreal r = blurRadius();
+    QRectF targetRectUnaligned = QRectF(src.rect()).translated(pos + offset()).adjusted(-r, -r, r, r);
+    QRect targetRect = targetRectUnaligned.toAlignedRect();
 
-        if (dropShadow)
-            source.append(".a");
+    // ensure even dimensions (going to divide by two)
+    targetRect.setWidth((targetRect.width() + 1) & ~1);
+    targetRect.setHeight((targetRect.height() + 1) & ~1);
 
-        if (!qFuzzyCompare(weight, qreal(1))) {
-            source.append(" * float(");
-            source.append(QByteArray::number(weight));
-            source.append(");\n");
-        } else {
-            source.append(";\n");
-        }
-    }
+    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
+    QGLBlurTextureCache *blurTextureCache = QGLBlurTextureCache::cacheForContext(ctx);
 
-    source.append("    return ");
-    if (dropShadow)
-        source.append("shadowColor * ");
-    source.append("sample;\n");
-    source.append("}\n");
+    QGLBlurTextureInfo *info = blurTextureCache->takeBlurTextureInfo(src);
+    if (!info || info->radius() != r) {
+        QImage half = qt_halfScaled(src.toImage().alphaChannel());
 
-    cached = new QByteArray(source);
-    shaderSourceCache.insert(key, cached);
+        qreal rx = r + targetRect.left() - targetRectUnaligned.left();
+        qreal ry = r + targetRect.top() - targetRectUnaligned.top();
 
-    return source;
-}
+        QImage image = QImage(targetRect.size() / 2, QImage::Format_Indexed8);
+        image.setColorTable(half.colorTable());
+        image.fill(0);
+        int dx = qRound(rx * qreal(0.5));
+        int dy = qRound(ry * qreal(0.5));
+        qt_rectcopy(image.bits(), half.bits(), dx, dy,
+                    half.width(), half.height(),
+                    image.bytesPerLine(), half.bytesPerLine());
 
-QGLPixmapDropShadowFilter::QGLPixmapDropShadowFilter(QGraphicsBlurEffect::BlurHints hints)
-    : m_haveCached(false)
-    , m_cachedRadius(0)
-    , m_hints(hints)
-{
-}
+        qt_blurImage(image, r * qreal(0.5), false, 1);
 
-bool QGLPixmapDropShadowFilter::processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &srcRect) const
-{
-    QGLPixmapDropShadowFilter *filter = const_cast<QGLPixmapDropShadowFilter *>(this);
+        GLuint texture = generateBlurTexture(image.size(), GL_ALPHA);
 
-    int actualRadius = qRound(blurRadius());
-    int filterRadius = actualRadius;
-    m_singlePass = filterRadius <= 3;
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, image.width(), image.height(), GL_ALPHA,
+                        GL_UNSIGNED_BYTE, image.bits());
 
-    if (!m_haveCached || filterRadius != m_cachedRadius) {
-        // Only regenerate the shader from source if parameters have changed.
-        m_haveCached = true;
-        m_cachedRadius = filterRadius;
-        QByteArray source = QGLPixmapBlurFilter::generateGaussianShader(filterRadius, m_singlePass, true);
-        filter->setSource(source);
+        info = new QGLBlurTextureInfo(image, texture, r);
     }
 
-    QRect targetRect = QRectF(src.rect()).translated(pos + offset()).adjusted(-actualRadius, -actualRadius, actualRadius, actualRadius).toAlignedRect();
-
-    if (m_singlePass) {
-        // prepare for updateUniforms
-        m_textureSize = src.size();
-
-        painter->save();
-        // ensure GL_LINEAR filtering is used
-        painter->setRenderHint(QPainter::SmoothPixmapTransform);
-        filter->setOnPainter(painter);
-        QBrush pixmapBrush = src;
-        pixmapBrush.setTransform(QTransform::fromTranslate(pos.x() + offset().x(), pos.y() + offset().y()));
-        painter->fillRect(targetRect, pixmapBrush);
-        filter->removeFromPainter(painter);
-        painter->restore();
-    } else {
-        QGLFramebufferObjectFormat format;
-        format.setInternalTextureFormat(GLenum(src.hasAlphaChannel() ? GL_RGBA : GL_RGB));
-        QGLFramebufferObject *fbo = qgl_fbo_pool()->acquire(targetRect.size(), format);
-
-        if (!fbo)
-            return false;
-
-        // prepare for updateUniforms
-        m_textureSize = src.size();
-
-        // horizontal pass, to pixmap
-        m_horizontalBlur = true;
-
-        QPainter fboPainter(fbo);
+    GLuint texture = info->texture();
 
-        glClearColor(0, 0, 0, 0);
-        glClear(GL_COLOR_BUFFER_BIT);
-
-        // ensure GL_LINEAR filtering is used
-        fboPainter.setRenderHint(QPainter::SmoothPixmapTransform);
-        fboPainter.setCompositionMode(QPainter::CompositionMode_Source);
-        filter->setOnPainter(&fboPainter);
-        QBrush pixmapBrush = src;
-        pixmapBrush.setTransform(QTransform::fromTranslate(actualRadius, actualRadius));
-        fboPainter.fillRect(QRect(0, 0, targetRect.width(), targetRect.height()), pixmapBrush);
-        filter->removeFromPainter(&fboPainter);
-        fboPainter.end();
-
-        QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(painter->paintEngine());
+    filter->setOnPainter(painter);
 
-        // vertical pass, to painter
-        m_horizontalBlur = false;
-        m_textureSize = fbo->size();
+    QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(painter->paintEngine());
+    painter->setRenderHint(QPainter::SmoothPixmapTransform);
 
-        painter->save();
-        // ensure GL_LINEAR filtering is used
-        painter->setRenderHint(QPainter::SmoothPixmapTransform);
-        filter->setOnPainter(painter);
-        engine->drawTexture(targetRect, fbo->texture(), fbo->size(), QRectF(0, fbo->height() - targetRect.height(), targetRect.width(), targetRect.height()));
-        filter->removeFromPainter(painter);
-        painter->restore();
+    engine->drawTexture(targetRect, texture, info->paddedImage().size(), info->paddedImage().rect());
 
-        qgl_fbo_pool()->release(fbo);
-    }
+    filter->removeFromPainter(painter);
 
     // Now draw the actual pixmap over the top.
     painter->drawPixmap(pos, src, srcRect);
 
+    blurTextureCache->insertBlurTextureInfo(src, info);
+
     return true;
 }
 
 void QGLPixmapDropShadowFilter::setUniforms(QGLShaderProgram *program)
 {
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
     QColor col = color();
-    if (m_horizontalBlur && !m_singlePass) {
-        program->setUniformValue("shadowColor", 1.0f, 1.0f, 1.0f, 1.0f);
-    } else {
-        qreal alpha = col.alphaF();
-        program->setUniformValue("shadowColor", col.redF() * alpha,
-                                                col.greenF() * alpha,
-                                                col.blueF() * alpha,
-                                                alpha);
-    }
-
-    if (m_hints & QGraphicsBlurEffect::QualityHint) {
-        if (m_singlePass)
-            program->setUniformValue("delta", 1.0 / m_textureSize.width(), 1.0 / m_textureSize.height());
-        else if (m_horizontalBlur)
-            program->setUniformValue("delta", 1.0 / m_textureSize.width(), 0.0);
-        else
-            program->setUniformValue("delta", 0.0, 1.0 / m_textureSize.height());
-    } else {
-        qreal blur = blurRadius() / qreal(m_cachedRadius);
-
-        if (m_singlePass)
-            program->setUniformValue("delta", blur / m_textureSize.width(), blur / m_textureSize.height());
-        else if (m_horizontalBlur)
-            program->setUniformValue("delta", blur / m_textureSize.width(), 0.0);
-        else
-            program->setUniformValue("delta", 0.0, blur / m_textureSize.height());
-    }
+    qreal alpha = col.alphaF();
+    program->setUniformValue("shadowColor", col.redF() * alpha,
+                                            col.greenF() * alpha,
+                                            col.blueF() * alpha,
+                                            alpha);
 }
 
 QT_END_NAMESPACE
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 0299ceac33..4e1d50d32c 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -424,6 +424,7 @@ bool QGLPixmapData::fromFile(const QString &filename, const char *format,
         resize(0, 0);
         data = file.readAll();
         file.close();
+        QGLShareContextScope ctx(qt_gl_share_widget()->context());
         QSize size = m_texture.bindCompressedTexture
             (data.constData(), data.size(), format);
         if (!size.isEmpty()) {
@@ -449,6 +450,7 @@ bool QGLPixmapData::fromData(const uchar *buffer, uint len, const char *format,
     const char *buf = reinterpret_cast<const char *>(buffer);
     if (m_texture.canBindCompressedTexture(buf, int(len), format, &alpha)) {
         resize(0, 0);
+        QGLShareContextScope ctx(qt_gl_share_widget()->context());
         QSize size = m_texture.bindCompressedTexture(buf, int(len), format);
         if (!size.isEmpty()) {
             w = size.width();
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro
index 8927c4c00f..c8c991720f 100644
--- a/src/openvg/openvg.pro
+++ b/src/openvg/openvg.pro
@@ -16,11 +16,13 @@ HEADERS += \
     qpaintengine_vg_p.h \
     qpixmapdata_vg_p.h \
     qpixmapfilter_vg_p.h \
-    qvgcompositionhelper_p.h
+    qvgcompositionhelper_p.h \
+    qvgimagepool_p.h
 SOURCES += \
     qpaintengine_vg.cpp \
     qpixmapdata_vg.cpp \
-    qpixmapfilter_vg.cpp
+    qpixmapfilter_vg.cpp \
+    qvgimagepool.cpp
 
 contains(QT_CONFIG, egl) {
     HEADERS += \
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 6b829dd45c..04fee085de 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -43,6 +43,7 @@
 #include "qpixmapdata_vg_p.h"
 #include "qpixmapfilter_vg_p.h"
 #include "qvgcompositionhelper_p.h"
+#include "qvgimagepool_p.h"
 #if !defined(QT_NO_EGL)
 #include <QtGui/private/qegl_p.h>
 #include "qwindowsurface_vgegl_p.h"
@@ -1018,7 +1019,7 @@ static VGImage toVGImage
 
     const uchar *pixels = img.bits();
 
-    VGImage vgImg = vgCreateImage
+    VGImage vgImg = QVGImagePool::instance()->createPermanentImage
         (format, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
     vgImageSubData
         (vgImg, pixels, img.bytesPerLine(), format, 0, 0,
@@ -1063,7 +1064,7 @@ static VGImage toVGImageSubRect
     const uchar *pixels = img.bits() + bpp * sr.x() +
                           img.bytesPerLine() * sr.y();
 
-    VGImage vgImg = vgCreateImage
+    VGImage vgImg = QVGImagePool::instance()->createPermanentImage
         (format, sr.width(), sr.height(), VG_IMAGE_QUALITY_FASTER);
     vgImageSubData
         (vgImg, pixels, img.bytesPerLine(), format, 0, 0,
@@ -1084,7 +1085,7 @@ static VGImage toVGImageWithOpacity(const QImage & image, qreal opacity)
 
     const uchar *pixels = img.bits();
 
-    VGImage vgImg = vgCreateImage
+    VGImage vgImg = QVGImagePool::instance()->createPermanentImage
         (VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
     vgImageSubData
         (vgImg, pixels, img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0,
@@ -1106,7 +1107,7 @@ static VGImage toVGImageWithOpacitySubRect
 
     const uchar *pixels = img.bits();
 
-    VGImage vgImg = vgCreateImage
+    VGImage vgImg = QVGImagePool::instance()->createPermanentImage
         (VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
     vgImageSubData
         (vgImg, pixels, img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0,
@@ -1194,6 +1195,12 @@ VGPaintType QVGPaintEnginePrivate::setBrush
             if (pd->classId() == QPixmapData::OpenVGClass) {
                 QVGPixmapData *vgpd = static_cast<QVGPixmapData *>(pd);
                 vgImg = vgpd->toVGImage();
+
+                // We don't want the pool to reclaim this image
+                // because we cannot predict when the paint object
+                // will stop using it.  Replacing the image with
+                // new data will make the paint object invalid.
+                vgpd->detachImageFromPool();
             } else {
                 vgImg = toVGImage(*(pd->buffer()));
                 deref = true;
@@ -1201,6 +1208,7 @@ VGPaintType QVGPaintEnginePrivate::setBrush
         } else if (pd->classId() == QPixmapData::OpenVGClass) {
             QVGPixmapData *vgpd = static_cast<QVGPixmapData *>(pd);
             vgImg = vgpd->toVGImage(opacity);
+            vgpd->detachImageFromPool();
         } else {
             vgImg = toVGImageWithOpacity(*(pd->buffer()), opacity);
             deref = true;
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 5d5fcbff93..358ec4d825 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -43,6 +43,7 @@
 #include "qpaintengine_vg_p.h"
 #include <QtGui/private/qdrawhelper_p.h>
 #include "qvg_p.h"
+#include "qvgimagepool_p.h"
 
 #ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE
 #include <graphics/sgimage.h>
@@ -63,6 +64,8 @@ QVGPixmapData::QVGPixmapData(PixelType type)
     vgImageOpacity = VG_INVALID_HANDLE;
     cachedOpacity = 1.0f;
     recreate = true;
+    inImagePool = false;
+    inLRU = false;
 #if !defined(QT_NO_EGL)
     context = 0;
     qt_vg_register_pixmap(this);
@@ -78,32 +81,43 @@ QVGPixmapData::~QVGPixmapData()
 #endif
 }
 
+void QVGPixmapData::destroyImages()
+{
+    if (inImagePool) {
+        QVGImagePool *pool = QVGImagePool::instance();
+        if (vgImage != VG_INVALID_HANDLE)
+            pool->releaseImage(this, vgImage);
+        if (vgImageOpacity != VG_INVALID_HANDLE)
+            pool->releaseImage(this, vgImageOpacity);
+    } else {
+        if (vgImage != VG_INVALID_HANDLE)
+            vgDestroyImage(vgImage);
+        if (vgImageOpacity != VG_INVALID_HANDLE)
+            vgDestroyImage(vgImageOpacity);
+    }
+    vgImage = VG_INVALID_HANDLE;
+    vgImageOpacity = VG_INVALID_HANDLE;
+    inImagePool = false;
+}
+
 void QVGPixmapData::destroyImageAndContext()
 {
     if (vgImage != VG_INVALID_HANDLE) {
         // We need to have a context current to destroy the image.
 #if !defined(QT_NO_EGL)
         if (context->isCurrent()) {
-            vgDestroyImage(vgImage);
-            if (vgImageOpacity != VG_INVALID_HANDLE)
-                vgDestroyImage(vgImageOpacity);
+            destroyImages();
         } else {
             // We don't currently have a widget surface active, but we
             // need a surface to make the context current.  So use the
             // shared pbuffer surface instead.
             context->makeCurrent(qt_vg_shared_surface());
-            vgDestroyImage(vgImage);
-            if (vgImageOpacity != VG_INVALID_HANDLE)
-                vgDestroyImage(vgImageOpacity);
+            destroyImages();
             context->lazyDoneCurrent();
         }
 #else
-        vgDestroyImage(vgImage);
-        if (vgImageOpacity != VG_INVALID_HANDLE)
-            vgDestroyImage(vgImageOpacity);
+        destroyImages();
 #endif
-        vgImage = VG_INVALID_HANDLE;
-        vgImageOpacity = VG_INVALID_HANDLE;
     }
 #if !defined(QT_NO_EGL)
     if (context) {
@@ -234,22 +248,22 @@ VGImage QVGPixmapData::toVGImage()
         context = qt_vg_create_context(0, QInternal::Pixmap);
 #endif
 
-    if (recreate && prevSize != QSize(w, h)) {
-        if (vgImage != VG_INVALID_HANDLE) {
-            vgDestroyImage(vgImage);
-            vgImage = VG_INVALID_HANDLE;
-        }
-        if (vgImageOpacity != VG_INVALID_HANDLE) {
-            vgDestroyImage(vgImageOpacity);
-            vgImageOpacity = VG_INVALID_HANDLE;
-        }
-    } else if (recreate) {
+    if (recreate && prevSize != QSize(w, h))
+        destroyImages();
+    else if (recreate)
         cachedOpacity = -1.0f;  // Force opacity image to be refreshed later.
-    }
 
     if (vgImage == VG_INVALID_HANDLE) {
-        vgImage = vgCreateImage
-            (VG_sARGB_8888_PRE, w, h, VG_IMAGE_QUALITY_FASTER);
+        vgImage = QVGImagePool::instance()->createImageForPixmap
+            (VG_sARGB_8888_PRE, w, h, VG_IMAGE_QUALITY_FASTER, this);
+
+        // Bail out if we run out of GPU memory - try again next time.
+        if (vgImage == VG_INVALID_HANDLE)
+            return VG_INVALID_HANDLE;
+
+        inImagePool = true;
+    } else if (inImagePool) {
+        QVGImagePool::instance()->useImage(this);
     }
 
     if (!source.isNull() && recreate) {
@@ -278,8 +292,17 @@ VGImage QVGPixmapData::toVGImage(qreal opacity)
     // Create an alternative image for the selected opacity.
     if (vgImageOpacity == VG_INVALID_HANDLE || cachedOpacity != opacity) {
         if (vgImageOpacity == VG_INVALID_HANDLE) {
-            vgImageOpacity = vgCreateImage
-                (VG_sARGB_8888_PRE, w, h, VG_IMAGE_QUALITY_FASTER);
+            if (inImagePool) {
+                vgImageOpacity = QVGImagePool::instance()->createImageForPixmap
+                    (VG_sARGB_8888_PRE, w, h, VG_IMAGE_QUALITY_FASTER, this);
+            } else {
+                vgImageOpacity = vgCreateImage
+                    (VG_sARGB_8888_PRE, w, h, VG_IMAGE_QUALITY_FASTER);
+            }
+
+            // Bail out if we run out of GPU memory - try again next time.
+            if (vgImageOpacity == VG_INVALID_HANDLE)
+                return VG_INVALID_HANDLE;
         }
         VGfloat matrix[20] = {
             1.0f, 0.0f, 0.0f, 0.0f,
@@ -300,6 +323,14 @@ VGImage QVGPixmapData::toVGImage(qreal opacity)
 #endif
 }
 
+void QVGPixmapData::detachImageFromPool()
+{
+    if (inImagePool) {
+        QVGImagePool::instance()->detachImage(this);
+        inImagePool = false;
+    }
+}
+
 void QVGPixmapData::hibernate()
 {
     // If the image was imported (e.g, from an SgImage under Symbian),
@@ -311,6 +342,14 @@ void QVGPixmapData::hibernate()
     destroyImageAndContext();
 }
 
+void QVGPixmapData::reclaimImages()
+{
+    if (!inImagePool)
+        return;
+    forceToImage();
+    destroyImages();
+}
+
 extern int qt_defaultDpiX();
 extern int qt_defaultDpiY();
 
@@ -403,14 +442,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
         if (!context)
             context = qt_vg_create_context(0, QInternal::Pixmap);
 
-        if (vgImage != VG_INVALID_HANDLE) {
-            vgDestroyImage(vgImage);
-            vgImage = VG_INVALID_HANDLE;
-        }
-        if (vgImageOpacity != VG_INVALID_HANDLE) {
-            vgDestroyImage(vgImageOpacity);
-            vgImageOpacity = VG_INVALID_HANDLE;
-        }
+        destroyImages();
         prevSize = QSize();
 
         TInt err = 0;
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index c0bb09852f..4ff95c1dc4 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -63,6 +63,7 @@ class RSGImage;
 QT_BEGIN_NAMESPACE
 
 class QEglContext;
+class QVGImagePool;
 
 #if !defined(QT_NO_EGL)
 class QVGPixmapData;
@@ -101,6 +102,9 @@ public:
     // Return the VGImage form for a specific opacity setting.
     virtual VGImage toVGImage(qreal opacity);
 
+    // Detach this image from the image pool.
+    virtual void detachImageFromPool();
+
     // Release the VG resources associated with this pixmap and copy
     // the pixmap's contents out of the GPU back into main memory.
     // The VG resource will be automatically recreated the next time
@@ -109,6 +113,10 @@ public:
     // process via a SgImage).
     virtual void hibernate();
 
+    // Called when the QVGImagePool wants to reclaim this pixmap's
+    // VGImage objects to reuse storage.
+    virtual void reclaimImages();
+
     QSize size() const { return QSize(w, h); }
 
 #if defined(Q_OS_SYMBIAN)
@@ -123,8 +131,13 @@ protected:
     void cleanup();
 #endif
 
-#if !defined(QT_NO_EGL)
 private:
+    QVGPixmapData *nextLRU;
+    QVGPixmapData *prevLRU;
+    bool inLRU;
+    friend class QVGImagePool;
+
+#if !defined(QT_NO_EGL)
     QVGPixmapData *next;
     QVGPixmapData *prev;
 
@@ -140,6 +153,7 @@ protected:
     qreal cachedOpacity;
     mutable QImage source;
     mutable bool recreate;
+    bool inImagePool;
 #if !defined(QT_NO_EGL)
     mutable QEglContext *context;
 #endif
@@ -148,6 +162,7 @@ protected:
     QImage::Format sourceFormat() const;
 
     void destroyImageAndContext();
+    void destroyImages();
 };
 
 QT_END_NAMESPACE
diff --git a/src/openvg/qpixmapfilter_vg.cpp b/src/openvg/qpixmapfilter_vg.cpp
index e17c7285ca..aa526ed99f 100644
--- a/src/openvg/qpixmapfilter_vg.cpp
+++ b/src/openvg/qpixmapfilter_vg.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qpixmapfilter_vg_p.h"
+#include "qvgimagepool_p.h"
 #include <QtCore/qvarlengtharray.h>
 #include <QtGui/qpainter.h>
 
@@ -82,9 +83,9 @@ void QVGPixmapConvolutionFilter::draw
         return;
 
     QSize size = pd->size();
-    VGImage dstImage = vgCreateImage
+    VGImage dstImage = QVGImagePool::instance()->createTemporaryImage
         (VG_sARGB_8888_PRE, size.width(), size.height(),
-         VG_IMAGE_QUALITY_FASTER);
+         VG_IMAGE_QUALITY_FASTER, pd);
     if (dstImage == VG_INVALID_HANDLE)
         return;
 
@@ -124,7 +125,7 @@ void QVGPixmapConvolutionFilter::draw
 
     if(child != dstImage)
         vgDestroyImage(child);
-    vgDestroyImage(dstImage);
+    QVGImagePool::instance()->releaseImage(0, dstImage);
 }
 
 QVGPixmapColorizeFilter::QVGPixmapColorizeFilter()
@@ -155,9 +156,9 @@ void QVGPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const
         return;
 
     QSize size = pd->size();
-    VGImage dstImage = vgCreateImage
+    VGImage dstImage = QVGImagePool::instance()->createTemporaryImage
         (VG_sARGB_8888_PRE, size.width(), size.height(),
-         VG_IMAGE_QUALITY_FASTER);
+         VG_IMAGE_QUALITY_FASTER, pd);
     if (dstImage == VG_INVALID_HANDLE)
         return;
 
@@ -217,7 +218,7 @@ void QVGPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const
 
     if(child != dstImage)
         vgDestroyImage(child);
-    vgDestroyImage(dstImage);
+    QVGImagePool::instance()->releaseImage(0, dstImage);
 }
 
 QVGPixmapDropShadowFilter::QVGPixmapDropShadowFilter()
@@ -248,9 +249,9 @@ void QVGPixmapDropShadowFilter::draw(QPainter *painter, const QPointF &dest, con
         return;
 
     QSize size = pd->size();
-    VGImage dstImage = vgCreateImage
+    VGImage dstImage = QVGImagePool::instance()->createTemporaryImage
         (VG_A_8, size.width(), size.height(),
-         VG_IMAGE_QUALITY_FASTER);
+         VG_IMAGE_QUALITY_FASTER, pd);
     if (dstImage == VG_INVALID_HANDLE)
         return;
 
@@ -282,7 +283,7 @@ void QVGPixmapDropShadowFilter::draw(QPainter *painter, const QPointF &dest, con
 
     if(child != dstImage)
         vgDestroyImage(child);
-    vgDestroyImage(dstImage);
+    QVGImagePool::instance()->releaseImage(0, dstImage);
 
     // Now draw the actual pixmap over the top.
     painter->drawPixmap(dest, src, srect);
@@ -316,9 +317,9 @@ void QVGPixmapBlurFilter::draw(QPainter *painter, const QPointF &dest, const QPi
         return;
 
     QSize size = pd->size();
-    VGImage dstImage = vgCreateImage
+    VGImage dstImage = QVGImagePool::instance()->createTemporaryImage
         (VG_sARGB_8888_PRE, size.width(), size.height(),
-         VG_IMAGE_QUALITY_FASTER);
+         VG_IMAGE_QUALITY_FASTER, pd);
     if (dstImage == VG_INVALID_HANDLE)
         return;
 
@@ -347,7 +348,7 @@ void QVGPixmapBlurFilter::draw(QPainter *painter, const QPointF &dest, const QPi
 
     if(child != dstImage)
         vgDestroyImage(child);
-    vgDestroyImage(dstImage);
+    QVGImagePool::instance()->releaseImage(0, dstImage);
 }
 
 #endif
diff --git a/src/openvg/qvgimagepool.cpp b/src/openvg/qvgimagepool.cpp
new file mode 100644
index 0000000000..93e6e03258
--- /dev/null
+++ b/src/openvg/qvgimagepool.cpp
@@ -0,0 +1,215 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtOpenVG module 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 "qvgimagepool_p.h"
+#include "qpixmapdata_vg_p.h"
+
+QT_BEGIN_NAMESPACE
+
+static QVGImagePool *qt_vg_image_pool = 0;
+
+class QVGImagePoolPrivate
+{
+public:
+    QVGImagePoolPrivate() : lruFirst(0), lruLast(0) {}
+
+    QVGPixmapData *lruFirst;
+    QVGPixmapData *lruLast;
+};
+
+QVGImagePool::QVGImagePool()
+    : d_ptr(new QVGImagePoolPrivate())
+{
+}
+
+QVGImagePool::~QVGImagePool()
+{
+}
+
+QVGImagePool *QVGImagePool::instance()
+{
+    if (!qt_vg_image_pool)
+        qt_vg_image_pool = new QVGImagePool();
+    return qt_vg_image_pool;
+}
+
+void QVGImagePool::setImagePool(QVGImagePool *pool)
+{
+    if (qt_vg_image_pool != pool)
+        delete qt_vg_image_pool;
+    qt_vg_image_pool = pool;
+}
+
+VGImage QVGImagePool::createTemporaryImage(VGImageFormat format,
+                                           VGint width, VGint height,
+                                           VGbitfield allowedQuality,
+                                           QVGPixmapData *keepData)
+{
+    VGImage image;
+    do {
+        image = vgCreateImage(format, width, height, allowedQuality);
+        if (image != VG_INVALID_HANDLE)
+            return image;
+    } while (reclaimSpace(format, width, height, keepData));
+    qWarning("QVGImagePool: cannot reclaim sufficient space for a %dx%d temporary image",
+             width, height);
+    return VG_INVALID_HANDLE;
+}
+
+VGImage QVGImagePool::createImageForPixmap(VGImageFormat format,
+                                           VGint width, VGint height,
+                                           VGbitfield allowedQuality,
+                                           QVGPixmapData *data)
+{
+    VGImage image;
+    do {
+        image = vgCreateImage(format, width, height, allowedQuality);
+        if (image != VG_INVALID_HANDLE) {
+            if (data)
+                moveToHeadOfLRU(data);
+            return image;
+        }
+    } while (reclaimSpace(format, width, height, data));
+    qWarning("QVGImagePool: cannot reclaim sufficient space for a %dx%d pixmap",
+             width, height);
+    return VG_INVALID_HANDLE;
+}
+
+VGImage QVGImagePool::createPermanentImage(VGImageFormat format,
+                                           VGint width, VGint height,
+                                           VGbitfield allowedQuality)
+{
+    VGImage image;
+    do {
+        image = vgCreateImage(format, width, height, allowedQuality);
+        if (image != VG_INVALID_HANDLE)
+            return image;
+    } while (reclaimSpace(format, width, height, 0));
+    qWarning("QVGImagePool: cannot reclaim sufficient space for a %dx%d image",
+             width, height);
+    return VG_INVALID_HANDLE;
+}
+
+void QVGImagePool::releaseImage(QVGPixmapData *data, VGImage image)
+{
+    // Very simple strategy at the moment: just destroy the image.
+    if (data)
+        removeFromLRU(data);
+    vgDestroyImage(image);
+}
+
+void QVGImagePool::useImage(QVGPixmapData *data)
+{
+    moveToHeadOfLRU(data);
+}
+
+void QVGImagePool::detachImage(QVGPixmapData *data)
+{
+    removeFromLRU(data);
+}
+
+bool QVGImagePool::reclaimSpace(VGImageFormat format,
+                                VGint width, VGint height,
+                                QVGPixmapData *data)
+{
+    Q_UNUSED(format);   // For future use in picking the best image to eject.
+    Q_UNUSED(width);
+    Q_UNUSED(height);
+
+    if (data)
+        moveToHeadOfLRU(data);
+
+    QVGPixmapData *lrudata = pixmapLRU();
+    if (lrudata && lrudata != data) {
+        lrudata->reclaimImages();
+        return true;
+    }
+
+    return false;
+}
+
+void QVGImagePool::hibernate()
+{
+    // Nothing to do here at the moment since the pool does not
+    // retain VGImage's after they have been released.
+}
+
+void QVGImagePool::moveToHeadOfLRU(QVGPixmapData *data)
+{
+    Q_D(QVGImagePool);
+    if (data->inLRU) {
+        if (!data->prevLRU)
+            return;     // Already at the head of the list.
+        removeFromLRU(data);
+    }
+    data->inLRU = true;
+    data->nextLRU = d->lruFirst;
+    data->prevLRU = 0;
+    if (d->lruFirst)
+        d->lruFirst->prevLRU = data;
+    else
+        d->lruLast = data;
+    d->lruFirst = data;
+}
+
+void QVGImagePool::removeFromLRU(QVGPixmapData *data)
+{
+    Q_D(QVGImagePool);
+    if (!data->inLRU)
+        return;
+    if (data->nextLRU)
+        data->nextLRU->prevLRU = data->prevLRU;
+    else
+        d->lruLast = data->prevLRU;
+    if (data->prevLRU)
+        data->prevLRU->nextLRU = data->nextLRU;
+    else
+        d->lruFirst = data->nextLRU;
+    data->inLRU = false;
+}
+
+QVGPixmapData *QVGImagePool::pixmapLRU()
+{
+    Q_D(QVGImagePool);
+    return d->lruLast;
+}
+
+QT_END_NAMESPACE
diff --git a/src/openvg/qvgimagepool_p.h b/src/openvg/qvgimagepool_p.h
new file mode 100644
index 0000000000..66a4998fd0
--- /dev/null
+++ b/src/openvg/qvgimagepool_p.h
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtOpenVG module 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 QVGIMAGEPOOL_P_H
+#define QVGIMAGEPOOL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qvg.h"
+#include <QtCore/qscopedpointer.h>
+
+QT_BEGIN_NAMESPACE
+
+class QVGPixmapData;
+class QVGImagePoolPrivate;
+
+class Q_OPENVG_EXPORT QVGImagePool
+{
+public:
+    QVGImagePool();
+    virtual ~QVGImagePool();
+
+    static QVGImagePool *instance();
+
+    // This function can be used from system-specific graphics system
+    // plugins to alter the image allocation strategy.
+    static void setImagePool(QVGImagePool *pool);
+
+    // Create a new VGImage from the pool with the specified parameters
+    // that is not associated with a pixmap.  The VGImage is returned to
+    // the pool when releaseImage() is called.
+    //
+    // This function will call reclaimSpace() when vgCreateImage() fails.
+    //
+    // This function is typically called when allocating temporary
+    // VGImage's for pixmap filters.  The "keepData" object will not
+    // be reclaimed if reclaimSpace() needs to be called.
+    virtual VGImage createTemporaryImage(VGImageFormat format,
+                                         VGint width, VGint height,
+                                         VGbitfield allowedQuality,
+                                         QVGPixmapData *keepData = 0);
+
+    // Create a new VGImage with the specified parameters and associate
+    // it with "data".  The QVGPixmapData will be notified when the
+    // VGImage needs to be reclaimed by the pool.
+    //
+    // This function will call reclaimSpace() when vgCreateImage() fails.
+    virtual VGImage createImageForPixmap(VGImageFormat format,
+                                         VGint width, VGint height,
+                                         VGbitfield allowedQuality,
+                                         QVGPixmapData *data);
+
+    // Create a permanent VGImage with the specified parameters.
+    // If there is insufficient space for the vgCreateImage call,
+    // then this function will call reclaimSpace() and try again.
+    //
+    // The caller is responsible for calling vgDestroyImage()
+    // when it no longer needs the VGImage, as the image is not
+    // recorded in the image pool.
+    //
+    // This function is typically used for pattern brushes where
+    // the OpenVG engine is responsible for managing the lifetime
+    // of the VGImage, destroying it automatically when the brush
+    // is no longer in use.
+    virtual VGImage createPermanentImage(VGImageFormat format,
+                                         VGint width, VGint height,
+                                         VGbitfield allowedQuality);
+
+    // Release a VGImage that is no longer required.
+    virtual void releaseImage(QVGPixmapData *data, VGImage image);
+
+    // Notify the pool that a QVGPixmapData object is using
+    // an image again.  This allows the pool to move the image
+    // within a least-recently-used list of QVGPixmapData objects.
+    virtual void useImage(QVGPixmapData *data);
+
+    // Notify the pool that the VGImage's associated with a
+    // QVGPixmapData are being detached from the pool.  The caller
+    // will become responsible for calling vgDestroyImage().
+    virtual void detachImage(QVGPixmapData *data);
+
+    // Reclaim space for an image allocation with the specified parameters.
+    // Returns true if space was reclaimed, or false if there is no
+    // further space that can be reclaimed.  The "data" parameter
+    // indicates the pixmap that is trying to obtain space which should
+    // not itself be reclaimed.
+    virtual bool reclaimSpace(VGImageFormat format,
+                              VGint width, VGint height,
+                              QVGPixmapData *data);
+
+    // Hibernate the image pool because the context is about to be
+    // destroyed.  All VGImage's left in the pool should be released.
+    virtual void hibernate();
+
+protected:
+    // Helper functions for managing the LRU list of QVGPixmapData objects.
+    void moveToHeadOfLRU(QVGPixmapData *data);
+    void removeFromLRU(QVGPixmapData *data);
+    QVGPixmapData *pixmapLRU();
+
+private:
+    QScopedPointer<QVGImagePoolPrivate> d_ptr;
+
+    Q_DECLARE_PRIVATE(QVGImagePool)
+    Q_DISABLE_COPY(QVGImagePool)
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/openvg/qwindowsurface_vgegl.cpp b/src/openvg/qwindowsurface_vgegl.cpp
index 15710830f6..bda60965f0 100644
--- a/src/openvg/qwindowsurface_vgegl.cpp
+++ b/src/openvg/qwindowsurface_vgegl.cpp
@@ -42,6 +42,7 @@
 #include "qwindowsurface_vgegl_p.h"
 #include "qpaintengine_vg_p.h"
 #include "qpixmapdata_vg_p.h"
+#include "qvgimagepool_p.h"
 #include "qvg_p.h"
 
 #if !defined(QT_NO_EGL)
@@ -360,6 +361,9 @@ void qt_vg_hibernate_pixmaps(QVGSharedContext *shared)
         pd = pd->next;
     }
 
+    // Hibernate any remaining VGImage's in the image pool.
+    QVGImagePool::instance()->hibernate();
+
     // Don't need the current context any more.
     shared->context->lazyDoneCurrent();
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 4cb0184ead..4744eb6851 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -958,47 +958,47 @@ struct FlagDescription {
 };
 
 static const FlagDescription accelerationDescriptions[] = {
-    { " DFXL_NONE ", DFXL_NONE },
-    { " DFXL_FILLRECTANGLE", DFXL_FILLRECTANGLE },
-    { " DFXL_DRAWRECTANGLE", DFXL_DRAWRECTANGLE },
-    { " DFXL_DRAWLINE", DFXL_DRAWLINE },
-    { " DFXL_FILLTRIANGLE", DFXL_FILLTRIANGLE },
-    { " DFXL_BLIT", DFXL_BLIT },
-    { " DFXL_STRETCHBLIT", DFXL_STRETCHBLIT },
-    { " DFXL_TEXTRIANGLES", DFXL_TEXTRIANGLES },
-    { " DFXL_DRAWSTRING", DFXL_DRAWSTRING },
+    { "DFXL_NONE", DFXL_NONE },
+    { "DFXL_FILLRECTANGLE", DFXL_FILLRECTANGLE },
+    { "DFXL_DRAWRECTANGLE", DFXL_DRAWRECTANGLE },
+    { "DFXL_DRAWLINE", DFXL_DRAWLINE },
+    { "DFXL_FILLTRIANGLE", DFXL_FILLTRIANGLE },
+    { "DFXL_BLIT", DFXL_BLIT },
+    { "DFXL_STRETCHBLIT", DFXL_STRETCHBLIT },
+    { "DFXL_TEXTRIANGLES", DFXL_TEXTRIANGLES },
+    { "DFXL_DRAWSTRING", DFXL_DRAWSTRING },
     { 0, 0 }
 };
 
 static const FlagDescription blitDescriptions[] = {
-    { " DSBLIT_NOFX", DSBLIT_NOFX },
-    { " DSBLIT_BLEND_ALPHACHANNEL", DSBLIT_BLEND_ALPHACHANNEL },
-    { " DSBLIT_BLEND_COLORALPHA", DSBLIT_BLEND_COLORALPHA },
-    { " DSBLIT_COLORIZE", DSBLIT_COLORIZE },
-    { " DSBLIT_SRC_COLORKEY", DSBLIT_SRC_COLORKEY },
-    { " DSBLIT_DST_COLORKEY", DSBLIT_DST_COLORKEY },
-    { " DSBLIT_SRC_PREMULTIPLY", DSBLIT_SRC_PREMULTIPLY },
-    { " DSBLIT_DST_PREMULTIPLY", DSBLIT_DST_PREMULTIPLY },
-    { " DSBLIT_DEMULTIPLY", DSBLIT_DEMULTIPLY },
-    { " DSBLIT_DEINTERLACE", DSBLIT_DEINTERLACE },
+    { "DSBLIT_NOFX", DSBLIT_NOFX },
+    { "DSBLIT_BLEND_ALPHACHANNEL", DSBLIT_BLEND_ALPHACHANNEL },
+    { "DSBLIT_BLEND_COLORALPHA", DSBLIT_BLEND_COLORALPHA },
+    { "DSBLIT_COLORIZE", DSBLIT_COLORIZE },
+    { "DSBLIT_SRC_COLORKEY", DSBLIT_SRC_COLORKEY },
+    { "DSBLIT_DST_COLORKEY", DSBLIT_DST_COLORKEY },
+    { "DSBLIT_SRC_PREMULTIPLY", DSBLIT_SRC_PREMULTIPLY },
+    { "DSBLIT_DST_PREMULTIPLY", DSBLIT_DST_PREMULTIPLY },
+    { "DSBLIT_DEMULTIPLY", DSBLIT_DEMULTIPLY },
+    { "DSBLIT_DEINTERLACE", DSBLIT_DEINTERLACE },
 #if (Q_DIRECTFB_VERSION >= 0x000923)
-    { " DSBLIT_SRC_PREMULTCOLOR", DSBLIT_SRC_PREMULTCOLOR },
-    { " DSBLIT_XOR", DSBLIT_XOR },
+    { "DSBLIT_SRC_PREMULTCOLOR", DSBLIT_SRC_PREMULTCOLOR },
+    { "DSBLIT_XOR", DSBLIT_XOR },
 #endif
 #if (Q_DIRECTFB_VERSION >= 0x010000)
-    { " DSBLIT_INDEX_TRANSLATION", DSBLIT_INDEX_TRANSLATION },
+    { "DSBLIT_INDEX_TRANSLATION", DSBLIT_INDEX_TRANSLATION },
 #endif
     { 0, 0 }
 };
 
 static const FlagDescription drawDescriptions[] = {
-    { " DSDRAW_NOFX", DSDRAW_NOFX },
-    { " DSDRAW_BLEND", DSDRAW_BLEND },
-    { " DSDRAW_DST_COLORKEY", DSDRAW_DST_COLORKEY },
-    { " DSDRAW_SRC_PREMULTIPLY", DSDRAW_SRC_PREMULTIPLY },
-    { " DSDRAW_DST_PREMULTIPLY", DSDRAW_DST_PREMULTIPLY },
-    { " DSDRAW_DEMULTIPLY", DSDRAW_DEMULTIPLY },
-    { " DSDRAW_XOR", DSDRAW_XOR },
+    { "DSDRAW_NOFX", DSDRAW_NOFX },
+    { "DSDRAW_BLEND", DSDRAW_BLEND },
+    { "DSDRAW_DST_COLORKEY", DSDRAW_DST_COLORKEY },
+    { "DSDRAW_SRC_PREMULTIPLY", DSDRAW_SRC_PREMULTIPLY },
+    { "DSDRAW_DST_PREMULTIPLY", DSDRAW_DST_PREMULTIPLY },
+    { "DSDRAW_DEMULTIPLY", DSDRAW_DEMULTIPLY },
+    { "DSDRAW_XOR", DSDRAW_XOR },
     { 0, 0 }
 };
 #endif
@@ -1259,11 +1259,14 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
     setIntOption(displayArgs, QLatin1String("height"), &h);
 
 #ifndef QT_NO_DIRECTFB_LAYER
-    result = d_ptr->dfb->GetDisplayLayer(d_ptr->dfb, DLID_PRIMARY,
+    int layerId = DLID_PRIMARY;
+    setIntOption(displayArgs, QLatin1String("layerid"), &layerId);
+
+    result = d_ptr->dfb->GetDisplayLayer(d_ptr->dfb, static_cast<DFBDisplayLayerID>(layerId),
                                          &d_ptr->dfbLayer);
     if (result != DFB_OK) {
         DirectFBError("QDirectFBScreen::connect: "
-                      "Unable to get primary display layer!", result);
+                      "Unable to get display layer!", result);
         return false;
     }
     result = d_ptr->dfbLayer->GetScreen(d_ptr->dfbLayer, &d_ptr->dfbScreen);
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index 021d52e7cb..b79418a1aa 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -128,7 +128,6 @@ IDirectFBWindow *QDirectFBWindowSurface::directFBWindow() const
     return (dfbWindow ? dfbWindow : (sibling ? sibling->dfbWindow : 0));
 }
 
-
 void QDirectFBWindowSurface::createWindow(const QRect &rect)
 {
     IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer();
@@ -169,6 +168,9 @@ void QDirectFBWindowSurface::createWindow(const QRect &rect)
         DirectFBErrorFatal("QDirectFBWindowSurface::createWindow", result);
 
     if (window()) {
+        if (window()->windowFlags() & Qt::WindowStaysOnTopHint) {
+            dfbWindow->SetStackingClass(dfbWindow, DWSC_UPPER);
+        }
         DFBWindowID winid;
         result = dfbWindow->GetID(dfbWindow, &winid);
         if (result != DFB_OK) {
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index 49c43617de..fe752c8acb 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -2264,7 +2264,7 @@ EXPORTS
 	?isSequential@QIODevice@@UBE_NXZ @ 2263 NONAME ; bool QIODevice::isSequential(void) const
 	?isSequential@QIODevicePrivate@@QBE_NXZ @ 2264 NONAME ; bool QIODevicePrivate::isSequential(void) const
 	?isSequential@QProcess@@UBE_NXZ @ 2265 NONAME ; bool QProcess::isSequential(void) const
-	?isSignalConnected@QObjectPrivate@@QBE_NH@Z @ 2266 NONAME ; bool QObjectPrivate::isSignalConnected(int) const
+	?isSignalConnected@QObjectPrivate@@QBE_NI@Z @ 2266 NONAME ; bool QObjectPrivate::isSignalConnected(unsigned int) const
 	?isSimpleText@QString@@QBE_NXZ @ 2267 NONAME ; bool QString::isSimpleText(void) const
 	?isSingleShot@QTimer@@QBE_NXZ @ 2268 NONAME ; bool QTimer::isSingleShot(void) const
 	?isSpace@QChar@@QBE_NXZ @ 2269 NONAME ; bool QChar::isSpace(void) const
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 60df1f5a29..d50e85f621 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12517,9 +12517,9 @@ EXPORTS
 	?effectiveFocusWidget@QWidgetPrivate@@QAEPAVQWidget@@XZ @ 12516 NONAME ; class QWidget * QWidgetPrivate::effectiveFocusWidget(void)
 	?ignoreUnusedNavigationEvents@QTextControl@@QBE_NXZ @ 12517 NONAME ; bool QTextControl::ignoreUnusedNavigationEvents(void) const
 	?setIgnoreUnusedNavigationEvents@QTextControl@@QAEX_N@Z @ 12518 NONAME ; void QTextControl::setIgnoreUnusedNavigationEvents(bool)
-	?discardUpdateRequest@QGraphicsItemPrivate@@QBE_N_N00@Z @ 12519 NONAME ; bool QGraphicsItemPrivate::discardUpdateRequest(bool, bool, bool) const
-	??1QImagePixmapCleanupHooks@@QAE@XZ @ 12520 NONAME ; QImagePixmapCleanupHooks::~QImagePixmapCleanupHooks(void)
+	??1QImagePixmapCleanupHooks@@QAE@XZ @ 12519 NONAME ; QImagePixmapCleanupHooks::~QImagePixmapCleanupHooks(void)
+	??1QVectorPath@@QAE@XZ @ 12520 NONAME ; QVectorPath::~QVectorPath(void)
 	?addCacheData@QVectorPath@@QBEPAUCacheEntry@1@PAVQPaintEngineEx@@PAXP6AX01@Z@Z @ 12521 NONAME ; struct QVectorPath::CacheEntry * QVectorPath::addCacheData(class QPaintEngineEx *, void *, void (*)(class QPaintEngineEx *, void *)) const
-	?makeCacheable@QVectorPath@@QBEXXZ @ 12522 NONAME ; void QVectorPath::makeCacheable(void) const
-	??1QVectorPath@@QAE@XZ @ 12523 NONAME ; QVectorPath::~QVectorPath(void)
+	?discardUpdateRequest@QGraphicsItemPrivate@@QBE_N_N00@Z @ 12522 NONAME ; bool QGraphicsItemPrivate::discardUpdateRequest(bool, bool, bool) const
+	?makeCacheable@QVectorPath@@QBEXXZ @ 12523 NONAME ; void QVectorPath::makeCacheable(void) const
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 429ca796a0..b6862e50ba 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -698,13 +698,13 @@ EXPORTS
 	_ZN11QFontDialogD2Ev @ 697 NONAME
 	_ZN11QFontEngine11boundingBoxEjRK10QTransform @ 698 NONAME
 	_ZN11QFontEngine11grayPaletteEv @ 699 NONAME
-	_ZN11QFontEngine13setGlyphCacheEN21QFontEngineGlyphCache4TypeEPS0_ @ 700 NONAME
+	_ZN11QFontEngine13setGlyphCacheEN21QFontEngineGlyphCache4TypeEPS0_ @ 700 NONAME ABSENT
 	_ZN11QFontEngine13setGlyphCacheEPvP21QFontEngineGlyphCache @ 701 NONAME
 	_ZN11QFontEngine15addGlyphsToPathEPjP11QFixedPointiP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE @ 702 NONAME
 	_ZN11QFontEngine16addOutlineToPathEffRK12QGlyphLayoutP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE @ 703 NONAME
 	_ZN11QFontEngine16alphaMapForGlyphEj @ 704 NONAME
 	_ZN11QFontEngine16alphaMapForGlyphEjRK10QTransform @ 705 NONAME
-	_ZN11QFontEngine16expireGlyphCacheEv @ 706 NONAME
+	_ZN11QFontEngine16expireGlyphCacheEv @ 706 NONAME ABSENT
 	_ZN11QFontEngine16getUnscaledGlyphEjP12QPainterPathP15glyph_metrics_t @ 707 NONAME
 	_ZN11QFontEngine16loadKerningPairsE6QFixed @ 708 NONAME
 	_ZN11QFontEngine16tightBoundingBoxERK12QGlyphLayout @ 709 NONAME
@@ -7615,8 +7615,8 @@ EXPORTS
 	_ZNK11QFontDialog11currentFontEv @ 7614 NONAME
 	_ZNK11QFontDialog12selectedFontEv @ 7615 NONAME
 	_ZNK11QFontDialog7optionsEv @ 7616 NONAME
-	_ZNK11QFontEngine10glyphCacheEN21QFontEngineGlyphCache4TypeERK10QTransform @ 7617 NONAME
-	_ZNK11QFontEngine10glyphCacheEPvRK10QTransform @ 7618 NONAME
+	_ZNK11QFontEngine10glyphCacheEN21QFontEngineGlyphCache4TypeERK10QTransform @ 7617 NONAME ABSENT
+	_ZNK11QFontEngine10glyphCacheEPvRK10QTransform @ 7618 NONAME ABSENT
 	_ZNK11QFontEngine10glyphCountEv @ 7619 NONAME
 	_ZNK11QFontEngine10propertiesEv @ 7620 NONAME
 	_ZNK11QFontEngine12getSfntTableEj @ 7621 NONAME
@@ -11741,4 +11741,47 @@ EXPORTS
 	_ZN11QVectorPathD2Ev @ 11740 NONAME
 	_ZNK11QVectorPath12addCacheDataEP14QPaintEngineExPvPFvS1_S2_E @ 11741 NONAME
 	_ZNK20QGraphicsItemPrivate20discardUpdateRequestEbbb @ 11742 NONAME
+	_ZN11QEglContext10extensionsEv @ 11743 NONAME ABSENT
+	_ZN11QEglContext10getDisplayEP12QPaintDevice @ 11744 NONAME ABSENT
+	_ZN11QEglContext10waitClientEv @ 11745 NONAME ABSENT
+	_ZN11QEglContext10waitNativeEv @ 11746 NONAME ABSENT
+	_ZN11QEglContext11doneCurrentEv @ 11747 NONAME ABSENT
+	_ZN11QEglContext11errorStringEi @ 11748 NONAME ABSENT
+	_ZN11QEglContext11makeCurrentEi @ 11749 NONAME ABSENT
+	_ZN11QEglContext11openDisplayEP12QPaintDevice @ 11750 NONAME ABSENT
+	_ZN11QEglContext11swapBuffersEi @ 11751 NONAME ABSENT
+	_ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME ABSENT
+	_ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME ABSENT
+	_ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME ABSENT
+	_ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME ABSENT
+	_ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME ABSENT
+	_ZN11QEglContext14defaultDisplayEP12QPaintDevice @ 11757 NONAME ABSENT
+	_ZN11QEglContext14destroySurfaceEi @ 11758 NONAME ABSENT
+	_ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME ABSENT
+	_ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME ABSENT
+	_ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME ABSENT
+	_ZN11QEglContext7destroyEv @ 11762 NONAME ABSENT
+	_ZN11QEglContextC1Ev @ 11763 NONAME ABSENT
+	_ZN11QEglContextC2Ev @ 11764 NONAME ABSENT
+	_ZN11QEglContextD1Ev @ 11765 NONAME ABSENT
+	_ZN11QEglContextD2Ev @ 11766 NONAME ABSENT
+	_ZN14QEglProperties11removeValueEi @ 11767 NONAME ABSENT
+	_ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME ABSENT
+	_ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME ABSENT
+	_ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME ABSENT
+	_ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME ABSENT
+	_ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME ABSENT
+	_ZN14QEglProperties8setValueEii @ 11773 NONAME ABSENT
+	_ZN14QEglPropertiesC1Ei @ 11774 NONAME ABSENT
+	_ZN14QEglPropertiesC1Ev @ 11775 NONAME ABSENT
+	_ZN14QEglPropertiesC2Ei @ 11776 NONAME ABSENT
+	_ZN14QEglPropertiesC2Ev @ 11777 NONAME ABSENT
+	_ZNK11QEglContext12configAttribEiPi @ 11778 NONAME ABSENT
+	_ZNK11QEglContext16configPropertiesEi @ 11779 NONAME ABSENT
+	_ZNK11QEglContext7isValidEv @ 11780 NONAME ABSENT
+	_ZNK11QEglContext9isCurrentEv @ 11781 NONAME ABSENT
+	_ZNK14QEglProperties5valueEi @ 11782 NONAME ABSENT
+	_ZNK14QEglProperties8toStringEv @ 11783 NONAME ABSENT
+	_ZNK11QFontEngine10glyphCacheEPvN21QFontEngineGlyphCache4TypeERK10QTransform @ 11784 NONAME
+	_ZNK20QGraphicsItemPrivate21effectiveBoundingRectERK6QRectF @ 11785 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index 8458983466..75266323e9 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -1,8 +1,8 @@
 EXPORTS
 	_Z16qPixmapToVGImageRK7QPixmap @ 1 NONAME
-	_Z20qt_vg_create_contextP12QPaintDevice @ 2 NONAME
+	_Z20qt_vg_create_contextP12QPaintDevice @ 2 NONAME ABSENT
 	_Z20qt_vg_shared_surfacev @ 3 NONAME
-	_Z21qt_vg_destroy_contextP11QEglContext @ 4 NONAME
+	_Z21qt_vg_destroy_contextP11QEglContext @ 4 NONAME ABSENT
 	_Z24qt_vg_image_to_vg_formatN6QImage6FormatE @ 5 NONAME
 	_Z25qt_vg_config_to_vg_formatP11QEglContext @ 6 NONAME
 	_Z25qt_vg_create_paint_enginev @ 7 NONAME
@@ -169,4 +169,8 @@ EXPORTS
 	_ZThn8_NK16QVGWindowSurface6metricEN12QPaintDevice17PaintDeviceMetricE @ 168 NONAME
 	_ZN14QVGPaintEngine10fillRegionERK7QRegionRK6QColorRK5QSize @ 169 NONAME
 	_ZN20QVGCompositionHelper10blitWindowEmRK5QSizeRK5QRectRK6QPointi @ 170 NONAME
+	_Z20qt_vg_create_contextP12QPaintDevicei @ 171 NONAME
+	_Z21qt_vg_destroy_contextP11QEglContexti @ 172 NONAME
+	_ZN13QVGPixmapData22destroyImageAndContextEv @ 173 NONAME
+	_ZN13QVGPixmapData9hibernateEv @ 174 NONAME
 
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index f13008729e..a384ba0edd 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -517,7 +517,7 @@ QVariant::Type qDecodeOCIType(const QString& ocitype, QSql::NumericalPrecisionPo
     }
     else if (ocitype == QLatin1String("LONG") || ocitype == QLatin1String("NCLOB")
              || ocitype == QLatin1String("CLOB"))
-        type = QVariant::ByteArray;
+        type = QVariant::String;
     else if (ocitype == QLatin1String("RAW") || ocitype == QLatin1String("LONG RAW")
              || ocitype == QLatin1String("ROWID") || ocitype == QLatin1String("BLOB")
              || ocitype == QLatin1String("CFILE") || ocitype == QLatin1String("BFILE"))
@@ -543,6 +543,7 @@ QVariant::Type qDecodeOCIType(int ocitype, QSql::NumericalPrecisionPolicy precis
     case SQLT_AVC:
     case SQLT_RDD:
     case SQLT_LNG:
+    case SQLT_CLOB:
 #ifdef SQLT_INTERVAL_YM
     case SQLT_INTERVAL_YM:
 #endif
@@ -584,7 +585,6 @@ QVariant::Type qDecodeOCIType(int ocitype, QSql::NumericalPrecisionPolicy precis
     case SQLT_NTY:
     case SQLT_REF:
     case SQLT_RID:
-    case SQLT_CLOB:
         type = QVariant::ByteArray;
         break;
     case SQLT_DAT:
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index e686873d58..fdf0c2c92e 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -172,28 +172,39 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode
     SQLSMALLINT msgLen = 0;
     SQLRETURN r = SQL_NO_DATA;
     SQLTCHAR state_[SQL_SQLSTATE_SIZE+1];
-    SQLTCHAR description_[SQL_MAX_MESSAGE_LENGTH];
+    QVarLengthArray<SQLTCHAR> description_(SQL_MAX_MESSAGE_LENGTH);
     QString result;
     int i = 1;
 
     description_[0] = 0;
+    r = SQLGetDiagRec(handleType,
+                      handle,
+                      i,
+                      state_,
+                      &nativeCode_,
+                      0,
+                      NULL,
+                      &msgLen);
+    if(r == SQL_NO_DATA)
+        return QString();
+    description_.resize(msgLen+1);
     do {
         r = SQLGetDiagRec(handleType,
                             handle,
                             i,
-                            (SQLTCHAR*)state_,
+                            state_,
                             &nativeCode_,
-                            (SQLTCHAR*)description_,
-                            SQL_MAX_MESSAGE_LENGTH, /* in bytes, not in characters */
+                            description_.data(),
+                            description_.size(),
                             &msgLen);
         if (r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) {
             if (nativeCode)
                 *nativeCode = nativeCode_;
             QString tmpstore;
 #ifdef UNICODE
-            tmpstore = QString((const QChar*)description_, msgLen);
+            tmpstore = QString((const QChar*)description_.data(), msgLen);
 #else
-            tmpstore = QString::fromLocal8Bit((const char*)description_, msgLen);
+            tmpstore = QString::fromLocal8Bit((const char*)description_.data(), msgLen);
 #endif
             if(result != tmpstore) {
                 if(!result.isEmpty())
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 3ed918e2e2..ac220bd3b3 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1147,12 +1147,12 @@ static QMatrix parseTransformationMatrix(const QStringRef &value)
             if (points.count() != 1)
                 goto error;
             const qreal deg2rad = qreal(0.017453292519943295769);
-            matrix.shear(tan(points[0]*deg2rad), 0);
+            matrix.shear(qTan(points[0]*deg2rad), 0);
         } else if (state == SkewY) {
             if (points.count() != 1)
                 goto error;
             const qreal deg2rad = qreal(0.017453292519943295769);
-            matrix.shear(0, tan(points[0]*deg2rad));
+            matrix.shear(0, qTan(points[0]*deg2rad));
         }
     }
   error:
@@ -1481,8 +1481,8 @@ static void pathArc(QPainterPath &path,
     yc = 0.5 * (y0 + y1) + sfactor * (x1 - x0);
     /* (xc, yc) is center of the circle. */
 
-    th0 = atan2(y0 - yc, x0 - xc);
-    th1 = atan2(y1 - yc, x1 - xc);
+    th0 = qAtan2(y0 - yc, x0 - xc);
+    th1 = qAtan2(y1 - yc, x1 - xc);
 
     th_arc = th1 - th0;
     if (th_arc < 0 && sweep_flag)
@@ -1578,8 +1578,8 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
                     count--;
                     break;
                 }
-                x = x0 = num[0] + offsetX;
-                y = y0 = num[1] + offsetY;
+                x = num[0] + offsetX;
+                y = num[1] + offsetY;
                 num += 2;
                 count -= 2;
                 path.lineTo(x, y);
@@ -1592,8 +1592,8 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
                     count--;
                     break;
                 }
-                x = x0 = num[0];
-                y = y0 = num[1];
+                x = num[0];
+                y = num[1];
                 num += 2;
                 count -= 2;
                 path.lineTo(x, y);
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 57927fdca6..c67f7d287d 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -771,7 +771,7 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
         qreal transXDiff = (to1-from1) * percentOfAnimation;
         qreal transX = from1 + transXDiff;
         m_transform = QTransform();
-        m_transform.shear(tan(transX * deg2rad), 0);
+        m_transform.shear(qTan(transX * deg2rad), 0);
         break;
     }
     case SkewY: {
@@ -786,7 +786,7 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
         qreal transYDiff = (to1 - from1) * percentOfAnimation;
         qreal transY = from1 + transYDiff;
         m_transform = QTransform();
-        m_transform.shear(0, tan(transY * deg2rad));
+        m_transform.shear(0, qTan(transY * deg2rad));
         break;
     }
     default:
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 8fcc0df64b..1a75cf6bf2 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -725,16 +725,6 @@ void Generator::generateMetacall()
             needEditable |= p.editable.endsWith(')');
             needUser |= p.user.endsWith(')');
         }
-        bool needAnything = needGet
-                            | needSet
-                            | needReset
-                            | needDesignable
-                            | needScriptable
-                            | needStored
-                            | needEditable
-                            | needUser;
-        if (!needAnything)
-            goto skip_properties;
         fprintf(out, "\n#ifndef QT_NO_PROPERTIES\n     ");
 
         if (needElse)
@@ -904,7 +894,6 @@ void Generator::generateMetacall()
 
         fprintf(out, "\n#endif // QT_NO_PROPERTIES");
     }
- skip_properties:
     if (methodList.size() || cdef->signalList.size() || cdef->propertyList.size())
         fprintf(out, "\n    ");
     fprintf(out,"return _id;\n}\n");
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp
index 2316ba2399..1ca2b3a71a 100644
--- a/tests/auto/moc/tst_moc.cpp
+++ b/tests/auto/moc/tst_moc.cpp
@@ -489,6 +489,7 @@ private slots:
     void constructors();
     void typenameWithUnsigned();
     void warnOnVirtualSignal();
+    void QTBUG5590_dummyProperty();
 signals:
     void sigWithUnsignedArg(unsigned foo);
     void sigWithSignedArg(signed foo);
@@ -1216,6 +1217,40 @@ void tst_Moc::warnOnVirtualSignal()
 #endif
 }
 
+
+class QTBUG5590_DummyObject: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool dummy)
+};
+
+class QTBUG5590_PropertyObject: public QTBUG5590_DummyObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue)
+    Q_PROPERTY(int value2 READ value2 WRITE setValue2)
+
+    public:
+        QTBUG5590_PropertyObject() :  m_value(85), m_value2(40) { }
+        int value() const { return m_value; }
+        void setValue(int value) { m_value = value; }
+        int value2() const { return m_value2; }
+        void setValue2(int value) { m_value2 = value; }
+    private:
+        int m_value, m_value2;
+};
+
+void tst_Moc::QTBUG5590_dummyProperty()
+{
+    QTBUG5590_PropertyObject o;
+    QCOMPARE(o.property("value").toInt(), 85);
+    QCOMPARE(o.property("value2").toInt(), 40);
+    o.setProperty("value", 32);
+    QCOMPARE(o.value(), 32);
+    o.setProperty("value2", 82);
+    QCOMPARE(o.value2(), 82);
+}
+
 QTEST_APPLESS_MAIN(tst_Moc)
 #include "tst_moc.moc"
 
diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
index 6479829fe0..bf3af63781 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
@@ -48,6 +48,7 @@
 #include <qlistview.h>
 #include <qlistwidget.h>
 #include <qtableview.h>
+#include <qtablewidget.h>
 #include <qtreeview.h>
 #include <qtreewidget.h>
 #include <qheaderview.h>
@@ -226,6 +227,7 @@ private slots:
     void shiftSelectionAfterRubberbandSelection();
     void ctrlRubberbandSelection();
     void QTBUG6407_extendedSelection();
+    void QTBUG6753_selectOnSelection();
 };
 
 class MyAbstractItemDelegate : public QAbstractItemDelegate
@@ -1475,5 +1477,26 @@ void tst_QAbstractItemView::QTBUG6407_extendedSelection()
 
 }
 
+void tst_QAbstractItemView::QTBUG6753_selectOnSelection()
+{
+    QTableWidget table(5, 5);
+    for (int i = 0; i < table.rowCount(); ++i)
+        for (int j = 0; j < table.columnCount(); ++j)
+            table.setItem(i, j, new QTableWidgetItem("choo-be-doo-wah"));
+
+    table.show();
+    table.setSelectionMode(QAbstractItemView::ExtendedSelection);
+    table.selectAll();
+    QTest::qWaitForWindowShown(&table);
+    QModelIndex item = table.model()->index(1,1);
+    QRect itemRect = table.visualRect(item);
+    QTest::mouseMove(table.viewport(), itemRect.center());
+    QTest::mouseClick(table.viewport(), Qt::LeftButton, Qt::NoModifier, itemRect.center());
+    QTest::qWait(20);
+
+    QCOMPARE(table.selectedItems().count(), 1);
+    QCOMPARE(table.selectedItems().first(), table.item(item.row(), item.column()));
+}
+
 QTEST_MAIN(tst_QAbstractItemView)
 #include "tst_qabstractitemview.moc"
diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
index 7f031530af..a3f0915953 100644
--- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -148,6 +148,7 @@ private slots:
     void task255471_decimalsValidation();
 
     void taskQTBUG_5008_textFromValueAndValidate();
+    void taskQTBUG_6670_selectAllWithPrefix();
 
 public slots:
     void valueChangedHelper(const QString &);
@@ -1084,5 +1085,16 @@ void tst_QDoubleSpinBox::taskQTBUG_5008_textFromValueAndValidate()
     QCOMPARE(spinbox.text(), spinbox.locale().toString(spinbox.value()));
 }
 
+void tst_QDoubleSpinBox::taskQTBUG_6670_selectAllWithPrefix()
+{
+    DoubleSpinBox spin;
+    spin.setPrefix("$ ");
+    spin.lineEdit()->selectAll();
+    QTest::keyClick(spin.lineEdit(), Qt::Key_1);
+    QCOMPARE(spin.value(), 1.);
+    QTest::keyClick(spin.lineEdit(), Qt::Key_2);
+    QCOMPARE(spin.value(), 12.);
+}
+
 QTEST_MAIN(tst_QDoubleSpinBox)
 #include "tst_qdoublespinbox.moc"
diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp
index 7ee56654b2..2b2f43116f 100644
--- a/tests/auto/qfile/tst_qfile.cpp
+++ b/tests/auto/qfile/tst_qfile.cpp
@@ -220,6 +220,9 @@ public:
 private:
     enum FileType { OpenQFile, OpenFd, OpenStream };
 
+    void openStandardStreamsFileDescriptors();
+    void openStandardStreamsBufferedStreams();
+
     bool openFd(QFile &file, QIODevice::OpenMode mode)
     {
         int fdMode = QT_OPEN_LARGEFILE | QT_OPEN_BINARY;
@@ -554,6 +557,10 @@ void tst_QFile::size()
     QFETCH( QString, filename );
     QFETCH( qint64, size );
 
+#ifdef Q_WS_WINCE
+        filename = QFileInfo(filename).absoluteFilePath();
+#endif
+
     {
         QFile f( filename );
         QCOMPARE( f.size(), size );
@@ -564,24 +571,29 @@ void tst_QFile::size()
 
     {
         QFile f;
-        int fd = QT_OPEN(filename.toLocal8Bit().constData(), QT_OPEN_RDONLY);
-        QVERIFY( fd != -1 );
-        QVERIFY( f.open(fd, QIODevice::ReadOnly) );
+        FILE* stream = QT_FOPEN(filename.toLocal8Bit().constData(), "rb");
+        QVERIFY( stream );
+        QVERIFY( f.open(stream, QIODevice::ReadOnly) );
         QCOMPARE( f.size(), size );
 
         f.close();
-        QT_CLOSE(fd);
+        fclose(stream);
     }
 
     {
+#ifdef Q_WS_WINCE
+        QSKIP("Currently low level file I/O not well supported on Windows CE", SkipSingle);
+#endif
         QFile f;
-        FILE* stream = QT_FOPEN(filename.toLocal8Bit().constData(), "rb");
-        QVERIFY( stream );
-        QVERIFY( f.open(stream, QIODevice::ReadOnly) );
+
+        int fd = QT_OPEN(filename.toLocal8Bit().constData(), QT_OPEN_RDONLY);
+
+        QVERIFY( fd != -1 );
+        QVERIFY( f.open(fd, QIODevice::ReadOnly) );
         QCOMPARE( f.size(), size );
 
         f.close();
-        fclose(stream);
+        QT_CLOSE(fd);
     }
 }
 
@@ -603,6 +615,7 @@ void tst_QFile::seek()
     QVERIFY(file.seek(10));
     QCOMPARE(file.pos(), qint64(10));
     QCOMPARE(file.size(), qint64(0));
+    file.close();
     QFile::remove("newfile.txt");
 }
 
@@ -1128,9 +1141,15 @@ void tst_QFile::copyFallback()
     QVERIFY(QFile::exists("file-copy-destination.txt"));
     QVERIFY(!file.isOpen());
 
+#ifdef Q_WS_WINCE
     // Need to reset permissions on Windows to be able to delete
     QVERIFY(QFile::setPermissions("file-copy-destination.txt",
-            QFile::ReadOwner | QFile::WriteOwner));
+            QFile::WriteOther));
+#else
+     // Need to reset permissions on Windows to be able to delete
+    QVERIFY(QFile::setPermissions("file-copy-destination.txt",
+           QFile::ReadOwner | QFile::WriteOwner));
+#endif
     QVERIFY(QFile::remove("file-copy-destination.txt"));
 
     // Fallback copy of open file.
@@ -1139,6 +1158,7 @@ void tst_QFile::copyFallback()
     QVERIFY(QFile::exists("file-copy-destination.txt"));
     QVERIFY(!file.isOpen());
 
+    file.close(); 
     QFile::remove("file-copy-destination.txt");
 }
 
@@ -2239,6 +2259,7 @@ void tst_QFile::rename()
 
     QFile file(source);
     QCOMPARE(file.rename(destination), result);
+
     if (result)
         QCOMPARE(file.error(), QFile::NoError);
     else
@@ -2367,6 +2388,7 @@ void tst_QFile::appendAndRead()
         QCOMPARE(readFile.read(1 << j).size(), 1 << j);
     }
 
+    readFile.close();
     QFile::remove(QLatin1String("appendfile.txt"));
 }
 
@@ -2608,10 +2630,15 @@ void tst_QFile::map()
     QFETCH(QFile::FileError, error);
 
     QString fileName = QDir::currentPath() + '/' + "qfile_map_testfile";
+
+#ifdef Q_WS_WINCE
+     fileName = QFileInfo(fileName).absoluteFilePath();
+#endif
+
     if (QFile::exists(fileName)) {
         QVERIFY(QFile::setPermissions(fileName,
             QFile::WriteOwner | QFile::ReadOwner | QFile::WriteUser | QFile::ReadUser));
-	QFile::remove(fileName);
+        QFile::remove(fileName);
     }
     QFile file(fileName);
 
@@ -2650,8 +2677,13 @@ void tst_QFile::map()
     QCOMPARE(file.error(), QFile::NoError);
 
     // hpux wont let you map multiple times.
-#if !defined(Q_OS_HPUX) && !defined(Q_USE_DEPRECATED_MAP_API)
+#if !defined(Q_OS_HPUX) && !defined(Q_USE_DEPRECATED_MAP_API) && !defined(Q_OS_WINCE)
     // exotic test to make sure that multiple maps work
+
+    // note: windows ce does not reference count mutliple maps
+    // it's essentially just the same reference but it 
+    // cause a resource lock on the file which prevents it 
+    // from being removed    uchar *memory1 = file.map(0, file.size());
     uchar *memory1 = file.map(0, file.size());
     QCOMPARE(file.error(), QFile::NoError);
     uchar *memory2 = file.map(0, file.size());
@@ -2687,7 +2719,6 @@ void tst_QFile::map()
         QVERIFY(!memory);
         QVERIFY(file.setPermissions(originalPermissions));
     }
-
     QVERIFY(file.remove());
 }
 
@@ -2800,8 +2831,14 @@ void tst_QFile::openDirectory()
     f1.close();
 }
 
-void tst_QFile::openStandardStreams()
+void tst_QFile::openStandardStreamsFileDescriptors()
 {
+#ifdef Q_WS_WINCE
+    //allthough Windows CE (not mobile!) has functions that allow redirecting
+    //the standard file descriptors to a file (see SetStdioPathW/GetStdioPathW)
+    //it does not have functions to simply open them like below .
+    QSKIP("Opening standard streams on Windows CE via descriptor not implemented", SkipAll);
+#endif
     // Using file descriptors
     {
         QFile in;
@@ -2826,7 +2863,13 @@ void tst_QFile::openStandardStreams()
         QCOMPARE( err.size(), (qint64)0 );
         QVERIFY( err.isSequential() );
     }
+}
 
+void tst_QFile::openStandardStreamsBufferedStreams()
+{
+#if defined (Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+    QSKIP("Unix only test.", SkipAll);
+#endif
     // Using streams
     {
         QFile in;
@@ -2853,6 +2896,12 @@ void tst_QFile::openStandardStreams()
     }
 }
 
+void tst_QFile::openStandardStreams()
+{
+    openStandardStreamsFileDescriptors();
+    openStandardStreamsBufferedStreams();
+}
+
 void tst_QFile::writeNothing()
 {
     for (int i = 0; i < 3; ++i) {
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 5dc072d4a1..532e5508e8 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -75,6 +75,7 @@ private slots:
     void graphicsViewClipping();
     void partialGLWidgetUpdates_data();
     void partialGLWidgetUpdates();
+    void glWidgetWithAlpha();
     void glWidgetRendering();
     void glFBOSimpleRendering();
     void glFBORendering();
@@ -251,15 +252,10 @@ void tst_QGL::getSetCheck()
 
     // bool QGLFormat::sampleBuffers()
     // void QGLFormat::setSampleBuffers(bool)
-#if !defined(QT_OPENGL_ES_2)
     QCOMPARE(false, obj1.sampleBuffers());
     QVERIFY(!obj1.testOption(QGL::SampleBuffers));
     QVERIFY(obj1.testOption(QGL::NoSampleBuffers));
-#else
-    QCOMPARE(true, obj1.sampleBuffers());
-    QVERIFY(obj1.testOption(QGL::SampleBuffers));
-    QVERIFY(!obj1.testOption(QGL::NoSampleBuffers));
-#endif
+
     obj1.setSampleBuffers(false);
     QCOMPARE(false, obj1.sampleBuffers());
     QVERIFY(obj1.testOption(QGL::NoSampleBuffers));
@@ -927,6 +923,17 @@ void tst_QGL::glPBufferRendering()
     QFUZZY_COMPARE_IMAGES(fb, reference);
 }
 
+void tst_QGL::glWidgetWithAlpha()
+{
+    QGLWidget* w = new QGLWidget(QGLFormat(QGL::AlphaChannel));
+    w->show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(w);
+#endif
+
+    delete w;
+}
+
 class GLWidget : public QGLWidget
 {
 public:
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 6e78522b78..1cb9f0d323 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -90,6 +90,7 @@ private slots:
     void parallelToHalfLayout();
     void globalSpacing();
     void graphicsAnchorHandling();
+    void invalidHierarchyCheck();
 };
 
 class RectWidget : public QGraphicsWidget
@@ -2058,5 +2059,24 @@ void tst_QGraphicsAnchorLayout::graphicsAnchorHandling()
     delete a;
 }
 
+void tst_QGraphicsAnchorLayout::invalidHierarchyCheck()
+{
+    QGraphicsWidget window(0, Qt::Window);
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    window.setLayout(l);
+
+    QCOMPARE(l->count(), 0);
+    QTest::ignoreMessage(QtWarningMsg, "QGraphicsAnchorLayout::addAnchor(): "
+                         "You cannot add the parent of the layout to the layout.");
+    QVERIFY(!l->addAnchor(l, Qt::AnchorLeft, &window, Qt::AnchorLeft));
+    QTest::ignoreMessage(QtWarningMsg, "QGraphicsAnchorLayout::addAnchor(): "
+                         "You cannot add the parent of the layout to the layout.");
+    l->addAnchors(l, &window);
+    QTest::ignoreMessage(QtWarningMsg, "QGraphicsAnchorLayout::addAnchor(): "
+                         "You cannot add the parent of the layout to the layout.");
+    l->addCornerAnchors(l, Qt::TopLeftCorner, &window, Qt::TopLeftCorner);
+    QCOMPARE(l->count(), 0);
+}
+
 QTEST_MAIN(tst_QGraphicsAnchorLayout)
 #include "tst_qgraphicsanchorlayout.moc"
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 259df4dac9..69fc11830e 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -69,6 +69,7 @@ private slots:
     void opacity();
     void grayscale();
     void colorize();
+    void drawPixmapItem();
 };
 
 void tst_QGraphicsEffect::initTestCase()
@@ -465,6 +466,54 @@ void tst_QGraphicsEffect::colorize()
     QCOMPARE(image.pixel(10, 10), qRgb(122, 193, 66));
 }
 
+class PixmapItemEffect : public QGraphicsEffect
+{
+public:
+    PixmapItemEffect(const QPixmap &source)
+        : QGraphicsEffect()
+        , pixmap(source)
+        , repaints(0)
+    {}
+
+    QRectF boundingRectFor(const QRectF &rect) const
+    { return rect; }
+
+    void draw(QPainter *painter)
+    {
+        QVERIFY(sourcePixmap(Qt::LogicalCoordinates).pixmapData() == pixmap.pixmapData());
+        QVERIFY((painter->worldTransform().type() <= QTransform::TxTranslate) == (sourcePixmap(Qt::DeviceCoordinates).pixmapData() == pixmap.pixmapData()));
+
+        ++repaints;
+    }
+    QPixmap pixmap;
+    int repaints;
+};
+
+void tst_QGraphicsEffect::drawPixmapItem()
+{
+    QImage image(32, 32, QImage::Format_RGB32);
+    QPainter p(&image);
+    p.fillRect(0, 0, 32, 16, Qt::blue);
+    p.fillRect(0, 16, 32, 16, Qt::red);
+    p.end();
+
+    QGraphicsScene scene;
+    QGraphicsPixmapItem *item = new QGraphicsPixmapItem(QPixmap::fromImage(image));
+    scene.addItem(item);
+
+    PixmapItemEffect *effect = new PixmapItemEffect(item->pixmap());
+    item->setGraphicsEffect(effect);
+
+    QGraphicsView view(&scene);
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+
+    item->rotate(180);
+    QTest::qWait(50);
+
+    QTRY_VERIFY(effect->repaints >= 2);
+}
+
 QTEST_MAIN(tst_QGraphicsEffect)
 #include "tst_qgraphicseffect.moc"
 
diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index 9991ab46fe..7a0d40ab60 100644
--- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -352,7 +352,7 @@ void tst_QGraphicsEffectSource::pixmapPadding_data()
 
     QTest::newRow("log,effectrect") << int(Qt::LogicalCoordinates)
                                     << int(QGraphicsEffect::PadToEffectiveBoundingRect)
-                                    << QSize(30, 30) << QPoint(-10, -10)
+                                    << QSize(20, 20) << QPoint(-5, -5)
                                     << 0x00000000u;
 
     QTest::newRow("dev,nopad") << int(Qt::DeviceCoordinates)
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 6266933d4c..03a587a247 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -233,6 +233,7 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
     {
         hints = painter->renderHints();
+        painter->setBrush(brush);
         painter->drawRect(boundingRect());
         ++repaints;
     }
@@ -247,6 +248,7 @@ public:
     QPainter::RenderHints hints;
     int repaints;
     QRectF br;
+    QBrush brush;
 };
 
 class tst_QGraphicsItem : public QObject
@@ -316,6 +318,7 @@ private slots:
     void childrenBoundingRect3();
     void group();
     void setGroup();
+    void setGroup2();
     void nestedGroups();
     void warpChildrenIntoGroup();
     void removeFromGroup();
@@ -1351,6 +1354,7 @@ void tst_QGraphicsItem::selected()
     view.setFixedSize(250, 250);
     view.show();
 
+    QTest::qWaitForWindowShown(&view);
     qApp->processEvents();
     qApp->processEvents();
 
@@ -3343,6 +3347,35 @@ void tst_QGraphicsItem::setGroup()
     QCOMPARE(rect->parentItem(), (QGraphicsItem *)0);
 }
 
+void tst_QGraphicsItem::setGroup2()
+{
+    QGraphicsScene scene;
+    QGraphicsItemGroup group;
+    scene.addItem(&group);
+
+    QGraphicsRectItem *rect = scene.addRect(50,50,50,50,Qt::NoPen,Qt::black);
+    rect->setTransformOriginPoint(50,50);
+    rect->setRotation(45);
+    rect->setScale(1.5);
+    rect->translate(20,20);
+    group.translate(-30,-40);
+    group.setRotation(180);
+    group.setScale(0.5);
+
+    QTransform oldSceneTransform = rect->sceneTransform();
+    rect->setGroup(&group);
+    QCOMPARE(rect->sceneTransform(), oldSceneTransform);
+
+    group.setRotation(20);
+    group.setScale(2);
+    rect->setRotation(90);
+    rect->setScale(0.8);
+
+    oldSceneTransform = rect->sceneTransform();
+    rect->setGroup(0);
+    QCOMPARE(rect->sceneTransform(), oldSceneTransform);
+}
+
 void tst_QGraphicsItem::nestedGroups()
 {
     QGraphicsItemGroup *group1 = new QGraphicsItemGroup;
@@ -7646,17 +7679,20 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
     EventTester *item1 = new EventTester;
     item1->br = itemBoundingRect;
     item1->setPos(-200, -200);
+    item1->brush = Qt::red;
 
     EventTester *item2 = new EventTester;
     item2->br = itemBoundingRect;
     item2->setFlag(QGraphicsItem::ItemIgnoresTransformations);
     item2->setParentItem(item1);
     item2->setPos(200, 200);
+    item2->brush = Qt::green;
 
     EventTester *item3 = new EventTester;
     item3->br = itemBoundingRect;
     item3->setParentItem(item2);
     item3->setPos(80, 80);
+    item3->brush = Qt::blue;
 
     scene.addItem(item1);
     QTest::qWait(100);
@@ -7671,8 +7707,8 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
     item1->setGraphicsEffect(shadow);
     QTest::qWait(50);
 
-    // Make sure all items are repainted.
-    QCOMPARE(item1->repaints, 1);
+    // Make sure all visible items are repainted.
+    QCOMPARE(item1->repaints, 0);
     QCOMPARE(item2->repaints, 1);
     QCOMPARE(item3->repaints, 1);
 
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 797e1fbf7b..69df39b1f8 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -3601,7 +3601,7 @@ void tst_QGraphicsView::inputMethodSensitivity()
     item->setFlag(QGraphicsItem::ItemIsFocusable);
     scene.addItem(item);
     scene.setFocusItem(item);
-    QCOMPARE(scene.focusItem(), item);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
 
     item->setFlag(QGraphicsItem::ItemAcceptsInputMethod, false);
@@ -3616,35 +3616,35 @@ void tst_QGraphicsView::inputMethodSensitivity()
     scene.addItem(item2);
     scene.setFocusItem(item2);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
-    QCOMPARE(scene.focusItem(), item2);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item2));
 
     scene.setFocusItem(item);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
-    QCOMPARE(scene.focusItem(), item);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 
     view.setScene(0);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
-    QCOMPARE(scene.focusItem(), item);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 
     view.setScene(&scene);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
-    QCOMPARE(scene.focusItem(), item);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 
     scene.setFocusItem(item2);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
-    QCOMPARE(scene.focusItem(), item2);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item2));
 
     view.setScene(0);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
-    QCOMPARE(scene.focusItem(), item2);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item2));
 
     scene.setFocusItem(item);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
-    QCOMPARE(scene.focusItem(), item);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 
     view.setScene(&scene);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
-    QCOMPARE(scene.focusItem(), item);
+    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 }
 
 class InputContextTester : public QInputContext
@@ -3878,7 +3878,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
         { lastBackgroundExposedRect = rect; }
         QRectF lastBackgroundExposedRect;
     };
-    
+
     class CustomRectItem : public QGraphicsRectItem
     {
     public:
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 3303df5553..a8352598f2 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -168,6 +168,7 @@ private slots:
     void task236127_bspTreeIndexFails();
     void task243004_setStyleCrash();
     void task250119_shortcutContext();
+    void QT_BUG_6544_tabFocusFirstUnsetWhenRemovingItems();
 };
 
 
@@ -2855,6 +2856,37 @@ void tst_QGraphicsWidget::polishEvent2()
     QVERIFY(widget->events.contains(QEvent::Polish));
 }
 
+void tst_QGraphicsWidget::QT_BUG_6544_tabFocusFirstUnsetWhenRemovingItems()
+{
+    QGraphicsScene scene;
+    QGraphicsWidget* parent1 = new QGraphicsWidget;
+    QGraphicsWidget* child1_0 = new QGraphicsWidget;
+    QGraphicsWidget* child1_1 = new QGraphicsWidget;
+
+    QGraphicsWidget* parent2 = new QGraphicsWidget;
+
+    // Add the parent and child to the scene.
+    scene.addItem(parent1);
+    child1_0->setParentItem(parent1);
+    child1_1->setParentItem(parent1);
+
+    // Hide and show the child.
+    child1_0->setParentItem(NULL);
+    scene.removeItem(child1_0);
+
+    // Remove parent from the scene.
+    scene.removeItem(parent1);
+
+    delete child1_0;
+    delete child1_1;
+    delete parent1;
+
+    // Add an item into the scene.
+    scene.addItem(parent2);
+
+    //This should not crash
+}
+
 QTEST_MAIN(tst_QGraphicsWidget)
 #include "tst_qgraphicswidget.moc"
 
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index 4d63e10bc9..348c41bd22 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -88,6 +88,7 @@
 #endif
 
 #include "../network-settings.h"
+#include "../../shared/util.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -124,6 +125,9 @@ private slots:
     void raceCondition();
     void threadSafety();
 
+    void multipleSameLookups();
+    void multipleDifferentLookups();
+
 protected slots:
     void resultsReady(const QHostInfo &);
 
@@ -131,6 +135,7 @@ private:
     bool ipv6LookupsAvailable;
     bool ipv6Available;
     bool lookupDone;
+    int lookupsDoneCounter;
     QHostInfo lookupResults;
 };
 
@@ -411,11 +416,53 @@ void tst_QHostInfo::threadSafety()
     }
 }
 
+// this test is for the multi-threaded QHostInfo rewrite. It is about getting results at all,
+// not about getting correct IPs
+void tst_QHostInfo::multipleSameLookups()
+{
+    const int COUNT = 10;
+    lookupsDoneCounter = 0;
+
+    for (int i = 0; i < COUNT; i++)
+        QHostInfo::lookupHost("localhost", this, SLOT(resultsReady(const QHostInfo)));
+
+    QTRY_VERIFY(lookupsDoneCounter == COUNT);
+
+    // spin two seconds more to see if it is not more :)
+    QTestEventLoop::instance().enterLoop(2);
+    QTRY_VERIFY(lookupsDoneCounter == COUNT);
+}
+
+// this test is for the multi-threaded QHostInfo rewrite. It is about getting results at all,
+// not about getting correct IPs
+void tst_QHostInfo::multipleDifferentLookups()
+{
+    QStringList hostnameList;
+    hostnameList << "www.ovi.com" << "www.nokia.com" << "qt.nokia.com" << "www.trolltech.com" << "troll.no"
+            << "www.qtcentre.org" << "forum.nokia.com" << "www.forum.nokia.com" << "wiki.forum.nokia.com"
+            << "www.nokia.no" << "nokia.de" << "127.0.0.1" << "----";
+
+    const int COUNT = hostnameList.size();
+    lookupsDoneCounter = 0;
+
+    for (int i = 0; i < hostnameList.size(); i++)
+        QHostInfo::lookupHost(hostnameList.at(i), this, SLOT(resultsReady(const QHostInfo)));
+
+    // give some time
+    QTestEventLoop::instance().enterLoop(5);
+    // try_verify gives some more time
+    QTRY_VERIFY(lookupsDoneCounter == COUNT);
+
+    // spin two seconds more to see if it is not more than expected
+    QTestEventLoop::instance().enterLoop(2);
+    QTRY_VERIFY(lookupsDoneCounter == COUNT);
+}
+
 void tst_QHostInfo::resultsReady(const QHostInfo &hi)
 {
     lookupDone = true;
     lookupResults = hi;
-
+    lookupsDoneCounter++;
     QTestEventLoop::instance().exitLoop();
 }
 
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index 863c3088eb..e16519065a 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -862,12 +862,18 @@ void tst_QListWidget::moveItemsPriv_data()
     QTest::newRow("Empty") << 0 << 0 << 0 << false;
     QTest::newRow("Overflow src") << 5 << 5 << 2 << false;
     QTest::newRow("Underflow src") << 5 << -1 << 2 << false;
-    QTest::newRow("Overflow dst") << 5 << 2 << 5 << false;
+    QTest::newRow("Overflow dst") << 5 << 2 << 6 << false;
     QTest::newRow("Underflow dst") << 5 << 2 << -1 << false;
     QTest::newRow("Same place") << 5 << 2 << 2 << false;
     QTest::newRow("Up") << 5 << 4 << 2 << true;
     QTest::newRow("Down") << 5 << 2 << 4 << true;
     QTest::newRow("QTBUG-6532 assert") << 5 << 0 << 1 << false;
+    QTest::newRow("QTBUG-6565 to the end") << 5 << 3 << 5 << true;
+    QTest::newRow("Same place 2") << 2 << 0 << 1 << false;
+    QTest::newRow("swap") << 2 << 0 << 2 << true;
+    QTest::newRow("swap2") << 4 << 1 << 3 << true;
+    QTest::newRow("swap3") << 4 << 3 << 2 << true;
+    QTest::newRow("swap4") << 2 << 1 << 0 << true;
 }
 
 void tst_QListWidget::moveItemsPriv()
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 67a9c462af..75d7a0a13f 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -126,6 +126,7 @@ private slots:
     void deleteQObjectWhenDeletingEvent();
     void overloads();
     void isSignalConnected();
+    void qMetaObjectConnect();
 protected:
 };
 
@@ -3058,10 +3059,8 @@ void tst_QObject::isSignalConnected()
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig05()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig15()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig29()")));
-    if (sizeof(void *) >= 8) { //on 32bit isSignalConnected only works with the first 32 signals
-        QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()")));
-        QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
-    }
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
 #endif
 
     QObject::connect(&o, SIGNAL(sig00()), &o, SIGNAL(sig69()));
@@ -3115,6 +3114,8 @@ void tst_QObject::isSignalConnected()
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig04()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig21()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig25()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig55()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
 #endif
 
     emit o.sig00();
@@ -3125,5 +3126,148 @@ void tst_QObject::isSignalConnected()
     QCOMPARE(o.rec, 2);
 }
 
+void tst_QObject::qMetaObjectConnect()
+{
+    SenderObject *s = new SenderObject;
+    ReceiverObject *r1 = new ReceiverObject;
+    ReceiverObject *r2 = new ReceiverObject;
+    r1->reset();
+    r2->reset();
+    ReceiverObject::sequence = 0;
+
+    int signal1Index = s->metaObject()->indexOfSignal("signal1()");
+    int signal3Index = s->metaObject()->indexOfSignal("signal3()");
+    int slot1Index = r1->metaObject()->indexOfSlot("slot1()");
+    int slot2Index = r1->metaObject()->indexOfSlot("slot2()");
+    int slot3Index = r1->metaObject()->indexOfSlot("slot3()");
+
+    QVERIFY(slot1Index > 0);
+    QVERIFY(slot2Index > 0);
+    QVERIFY(slot3Index > 0);
+
+    QVERIFY( QMetaObject::connect( s, signal1Index, r1, slot1Index) );
+    QVERIFY( QMetaObject::connect( s, signal3Index, r2, slot3Index) );
+    QVERIFY( QMetaObject::connect( s, -1, r2, slot2Index) );
+
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 0 );
+    QCOMPARE( r1->count_slot3, 0 );
+    QCOMPARE( r2->count_slot1, 0 );
+    QCOMPARE( r2->count_slot2, 0 );
+    QCOMPARE( r2->count_slot3, 0 );
+
+    s->emitSignal1();
+
+    QCOMPARE( r1->count_slot1, 1 );
+    QCOMPARE( r1->count_slot2, 0 );
+    QCOMPARE( r1->count_slot3, 0 );
+    QCOMPARE( r2->count_slot1, 0 );
+    QCOMPARE( r2->count_slot2, 1 );
+    QCOMPARE( r2->count_slot3, 0 );
+
+    s->emitSignal2();
+    s->emitSignal3();
+    s->emitSignal4();
+
+    QCOMPARE( r1->count_slot1, 1 );
+    QCOMPARE( r1->count_slot2, 0 );
+    QCOMPARE( r1->count_slot3, 0 );
+    QCOMPARE( r2->count_slot1, 0 );
+    QCOMPARE( r2->count_slot2, 4 );
+    QCOMPARE( r2->count_slot3, 1 );
+
+    QVERIFY( QMetaObject::disconnect( s, signal1Index, r1, slot1Index) );
+    QVERIFY( QMetaObject::disconnect( s, signal3Index, r2, slot3Index) );
+    QVERIFY( QMetaObject::disconnect( s, -1, r2, slot2Index) );
+
+    s->emitSignal1();
+    s->emitSignal2();
+    s->emitSignal3();
+    s->emitSignal4();
+
+    QCOMPARE( r1->count_slot1, 1 );
+    QCOMPARE( r1->count_slot2, 0 );
+    QCOMPARE( r1->count_slot3, 0 );
+    QCOMPARE( r2->count_slot1, 0 );
+    QCOMPARE( r2->count_slot2, 4 );
+    QCOMPARE( r2->count_slot3, 1 );
+
+    //some "dynamic" signal
+    QVERIFY( QMetaObject::connect( s, s->metaObject()->methodOffset() + 20, r1, slot3Index) );
+    QVERIFY( QMetaObject::connect( s, s->metaObject()->methodOffset() + 35, r2, slot1Index) );
+    QVERIFY( QMetaObject::connect( s, -1, r1, slot2Index) );
+
+    r1->reset();
+    r2->reset();
+
+    void *args[] = { 0 , 0 };
+    QMetaObject::activate(s, s->metaObject()->methodOffset() + 20, args);
+    QMetaObject::activate(s, s->metaObject()->methodOffset() + 48, args);
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 2 );
+    QCOMPARE( r1->count_slot3, 1 );
+    QCOMPARE( r2->count_slot1, 0 );
+    QCOMPARE( r2->count_slot2, 0 );
+    QCOMPARE( r2->count_slot3, 0 );
+
+    QMetaObject::activate(s, s->metaObject()->methodOffset() + 35, args);
+    s->emitSignal1();
+    s->emitSignal2();
+
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 5 );
+    QCOMPARE( r1->count_slot3, 1 );
+    QCOMPARE( r2->count_slot1, 1 );
+    QCOMPARE( r2->count_slot2, 0 );
+    QCOMPARE( r2->count_slot3, 0 );
+
+    delete s;
+    r1->reset();
+    r2->reset();
+
+#define SIGNAL_INDEX(S)  obj1.metaObject()->indexOfSignal(QMetaObject::normalizedSignature(#S))
+    OverloadObject obj1;
+    QObject obj2, obj3;
+
+    QMetaObject::connect(&obj1, SIGNAL_INDEX(sig(int)) , r1, slot1Index);
+    QMetaObject::connect(&obj1, SIGNAL_INDEX(sig(QObject *, QObject *, QObject *)) , r2, slot1Index);
+
+    QMetaObject::connect(&obj1, SIGNAL_INDEX(sig(QObject *, QObject *, QObject *, QObject *)) , r1, slot2Index);
+    QMetaObject::connect(&obj1, SIGNAL_INDEX(sig(QObject *)) , r2, slot2Index);
+    QMetaObject::connect(&obj1, SIGNAL_INDEX(sig(int, int)) , r1, slot3Index);
+
+    emit obj1.sig(0.5); //connected to nothing
+    emit obj1.sig(1, 'a'); //connected to nothing
+    QCOMPARE( r1->count_slot1, 0 );
+    QCOMPARE( r1->count_slot2, 0 );
+    QCOMPARE( r1->count_slot3, 0 );
+    QCOMPARE( r2->count_slot1, 0 );
+    QCOMPARE( r2->count_slot2, 0 );
+    QCOMPARE( r2->count_slot3, 0 );
+
+    emit obj1.sig(1); //this signal is connected
+    emit obj1.sig(&obj2);
+
+    QCOMPARE( r1->count_slot1, 1 );
+    QCOMPARE( r1->count_slot2, 0 );
+    QCOMPARE( r1->count_slot3, 1 );
+    QCOMPARE( r2->count_slot1, 0 );
+    QCOMPARE( r2->count_slot2, 1 );
+    QCOMPARE( r2->count_slot3, 0 );
+
+    emit obj1.sig(&obj2, &obj3); //this signal is connected
+
+    QCOMPARE( r1->count_slot1, 1 );
+    QCOMPARE( r1->count_slot2, 1 );
+    QCOMPARE( r1->count_slot3, 1 );
+    QCOMPARE( r2->count_slot1, 1 );
+    QCOMPARE( r2->count_slot2, 1 );
+    QCOMPARE( r2->count_slot3, 0 );
+
+    delete r1;
+    delete r2;
+
+}
+
 QTEST_MAIN(tst_QObject)
 #include "tst_qobject.moc"
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 0effd011f5..0164c9d036 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -1289,6 +1289,12 @@ void tst_QPixmap::copy()
     QPixmap expected(10, 10);
     expected.fill(Qt::blue);
     QVERIFY(lenientCompare(dest, expected));
+
+    QPixmap trans;
+    trans.fill(Qt::transparent);
+
+    QPixmap transCopy = trans.copy();
+    QVERIFY(pixmapsAreEqual(&trans, &transCopy));
 }
 
 #ifdef QT3_SUPPORT
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
index 9775d360d3..c89a18272e 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
@@ -70,6 +70,7 @@ private slots:
     void remove();
     void clear();
     void pixmapKey();
+    void noLeak();
 };
 
 static QPixmapCache::KeyData* getPrivate(QPixmapCache::Key &key)
@@ -482,5 +483,23 @@ void tst_QPixmapCache::pixmapKey()
     QVERIFY(!getPrivate(key8));
 }
 
+extern int q_QPixmapCache_keyHashSize();
+
+void tst_QPixmapCache::noLeak()
+{
+    QPixmapCache::Key key;
+
+    int oldSize = q_QPixmapCache_keyHashSize();
+    for (int i = 0; i < 100; ++i) {
+        QPixmap pm(128, 128);
+        pm.fill(Qt::transparent);
+        key = QPixmapCache::insert(pm);
+        QPixmapCache::remove(key);
+    }
+    int newSize = q_QPixmapCache_keyHashSize();
+
+    QCOMPARE(oldSize, newSize);
+}
+
 QTEST_MAIN(tst_QPixmapCache)
 #include "tst_qpixmapcache.moc"
diff --git a/tests/auto/qresourceengine/tst_qresourceengine.cpp b/tests/auto/qresourceengine/tst_qresourceengine.cpp
index cc6eda3d43..ed7de23482 100644
--- a/tests/auto/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/qresourceengine/tst_qresourceengine.cpp
@@ -62,6 +62,7 @@ private slots:
     void searchPath_data();
     void searchPath();
     void doubleSlashInRoot();
+    void setLocale();
 
 private:
     QString builddir;
@@ -460,6 +461,27 @@ void tst_QResourceEngine::doubleSlashInRoot()
     QVERIFY(QFile::exists("://secondary_root/runtime_resource/search_file.txt"));
 }
 
+void tst_QResourceEngine::setLocale()
+{
+    QLocale::setDefault(QLocale::c());
+
+    // default constructed QResource gets the default locale
+    QResource resource;
+    resource.setFileName("aliasdir/aliasdir.txt");
+    QVERIFY(!resource.isCompressed());
+
+    // change the default locale and make sure it doesn't affect the resource
+    QLocale::setDefault(QLocale("de_CH"));
+    QVERIFY(!resource.isCompressed());
+
+    // then explicitly set the locale on qresource
+    resource.setLocale(QLocale("de_CH"));
+    QVERIFY(resource.isCompressed());
+
+    // the reset the default locale back
+    QLocale::setDefault(QLocale::system());
+}
+
 QTEST_MAIN(tst_QResourceEngine)
 
 #include "tst_qresourceengine.moc"
diff --git a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
index f72b6f7c74..41485948cd 100644
--- a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
@@ -756,12 +756,12 @@ void tst_QSharedMemory::simpleProcessProducerConsumer()
             ++failedProcesses;
     }
 
-    producer.waitForFinished(5000);
+    QVERIFY(producer.waitForFinished(5000));
 
     bool consumerFailed = false;
 
     while (!consumers.isEmpty()) {
-        consumers.first()->waitForFinished(2000);
+        QVERIFY(consumers.first()->waitForFinished(3000));
         if (consumers.first()->state() == QProcess::Running ||
             consumers.first()->exitStatus() != QProcess::NormalExit ||
             consumers.first()->exitCode() != 0) {
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index cb4e103692..4f89708a17 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -942,9 +942,9 @@ void tst_QSqlDatabase::recordOCI()
         FieldDef("raw(2000)", QVariant::ByteArray,      QByteArray(Q3CString("blah6")), false),
         FieldDef("blob", QVariant::ByteArray,           QByteArray(Q3CString("blah7"))),
 #endif
-//FIXME FieldDef("clob", QVariant::CString,             Q3CString("blah8")),
-//FIXME FieldDef("nclob", QVariant::CString,            Q3CString("blah9")),
-//X     FieldDef("bfile", QVariant::ByteArray,          QByteArray(Q3CString("blah10"))),
+        FieldDef("clob", QVariant::String,             QString("blah8")),
+        FieldDef("nclob", QVariant::String,            QString("blah9")),
+        FieldDef("bfile", QVariant::ByteArray,         QByteArray("blah10")),
 
     intytm,
     intdts,
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index a8908fd136..2a55c32608 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -201,6 +201,8 @@ private slots:
     void QTBUG_5251();
     void QTBUG_6421_data() { generic_data("QOCI"); }
     void QTBUG_6421();
+    void QTBUG_6618_data() { generic_data("QODBC"); }
+    void QTBUG_6618();
 
 private:
     // returns all database connections
@@ -2961,5 +2963,27 @@ void tst_QSqlQuery::QTBUG_6421()
     QCOMPARE(q.value(0).toString(), QLatin1String("\"COL3\""));
 }
 
+void tst_QSqlQuery::QTBUG_6618()
+{
+    QFETCH( QString, dbName );
+    QSqlDatabase db = QSqlDatabase::database( dbName );
+    CHECK_DATABASE( db );
+    if (!tst_Databases::isSqlServer( db ))
+        QSKIP("SQL Server specific test", SkipSingle);
+
+    QSqlQuery q(db);
+    q.exec( "drop procedure " + qTableName( "tst_raiseError" ) );  //non-fatal
+    QString errorString;
+    for (int i=0;i<110;i++)
+        errorString+="reallylong";
+    errorString+=" error";
+    QVERIFY_SQL( q, exec("create procedure " + qTableName( "tst_raiseError" ) + " as\n"
+                         "begin\n"
+                         "    raiserror('" + errorString + "', 16, 1)\n"
+                         "end\n" ));
+    q.exec( "{call " + qTableName( "tst_raiseError" ) + "}" );
+    QVERIFY(q.lastError().text().contains(errorString));
+}
+
 QTEST_MAIN( tst_QSqlQuery )
 #include "tst_qsqlquery.moc"
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 3d68a734db..ae0131c07e 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -272,6 +272,8 @@ private slots:
     void numericalConvert();
     void moreCustomTypes();
     void variantInVariant();
+
+    void colorInteger();
 };
 
 Q_DECLARE_METATYPE(QDate)
@@ -3388,5 +3390,20 @@ void tst_QVariant::variantInVariant()
     QCOMPARE(qvariant_cast<QVariant>(var9), var1);
 }
 
+void tst_QVariant::colorInteger()
+{
+    QVariant v = QColor(Qt::red);
+    QCOMPARE(v.type(), QVariant::Color);
+    QCOMPARE(v.value<QColor>(), QColor(Qt::red));
+
+    v.setValue(1000);
+    QCOMPARE(v.type(), QVariant::Int);
+    QCOMPARE(v.toInt(), 1000);
+
+    v.setValue(QColor(Qt::yellow));
+    QCOMPARE(v.type(), QVariant::Color);
+    QCOMPARE(v.value<QColor>(), QColor(Qt::yellow));
+}
+
 QTEST_MAIN(tst_QVariant)
 #include "tst_qvariant.moc"
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 917003925e..bffa009976 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -20,6 +20,24 @@ SUBDIRS = containers-associative \
         qregion \
         qvariant \
 	qwidget	\
-	qtwidgets
+	qtwidgets \
+	qapplication \
+	qdir \
+	qdiriterator \
+	qgraphicsanchorlayout \
+	qgraphicsitem \
+	qgraphicswidget \
+	qmetaobject \
+	qpixmapcache \
+	qquaternion \
+	qscriptclass \
+	qscriptengine \
+	qscriptvalue \
+	qstringbuilder \
+	qstylesheetstyle \
+	qsvgrenderer \
+	qtableview
+
+
 
 contains(QT_CONFIG, opengl): SUBDIRS += opengl
diff --git a/tests/benchmarks/containers-sequential/main.cpp b/tests/benchmarks/containers-sequential/main.cpp
index 76643caeef..885db3e612 100644
--- a/tests/benchmarks/containers-sequential/main.cpp
+++ b/tests/benchmarks/containers-sequential/main.cpp
@@ -59,7 +59,7 @@ public:
 };
 
 template <typename T>
-static T * f(T *ts) // dummy function to prevent code from being optimized away by the compiler
+T * f(T *ts) // dummy function to prevent code from being optimized away by the compiler
 {
     return ts;
 }
@@ -81,7 +81,7 @@ class UseCases_QVector : public UseCases<T>
     void lookup(int size)
     {
         QVector<T> v;
-    
+
         T t;
         for (int i = 0; i < size; ++i)
             v.append(t);
@@ -113,7 +113,7 @@ class UseCases_stdvector : public UseCases<T>
     void lookup(int size)
     {
         std::vector<T> v;
-    
+
         T t;
         for (int i = 0; i < size; ++i)
             v.push_back(t);
@@ -132,6 +132,13 @@ struct Large { // A "large" item type
     int x[1000];
 };
 
+// Symbian devices typically have limited memory
+#ifdef Q_OS_SYMBIAN
+#  define LARGE_MAX_SIZE 2000
+#else
+#  define LARGE_MAX_SIZE 20000
+#endif
+
 class tst_vector_vs_std : public QObject
 {
     Q_OBJECT
@@ -190,7 +197,7 @@ void tst_vector_vs_std::insert_Large_data()
     QTest::addColumn<bool>("useStd");
     QTest::addColumn<int>("size");
 
-    for (int size = 10; size < 20000; size += 100) {
+    for (int size = 10; size < LARGE_MAX_SIZE; size += 100) {
         const QByteArray sizeString = QByteArray::number(size);
         QTest::newRow(("std::vector-Large--" + sizeString).constData()) << true << size;
         QTest::newRow(("QVector-Large--" + sizeString).constData()) << false << size;
@@ -236,7 +243,7 @@ void tst_vector_vs_std::lookup_Large_data()
     QTest::addColumn<bool>("useStd");
     QTest::addColumn<int>("size");
 
-    for (int size = 10; size < 20000; size += 100) {
+    for (int size = 10; size < LARGE_MAX_SIZE; size += 100) {
         const QByteArray sizeString = QByteArray::number(size);
         QTest::newRow(("std::vector-Large--" + sizeString).constData()) << true << size;
         QTest::newRow(("QVector-Large--" + sizeString).constData()) << false << size;
diff --git a/tests/benchmarks/events/main.cpp b/tests/benchmarks/events/main.cpp
index 7c9de8ffc0..09d6c53933 100644
--- a/tests/benchmarks/events/main.cpp
+++ b/tests/benchmarks/events/main.cpp
@@ -47,6 +47,7 @@ class PingPong : public QObject
 {
 public:
     void setPeer(QObject *peer);
+    void resetCounter() {m_counter = 100;}
 
 protected:
     bool event(QEvent *e);
@@ -69,7 +70,7 @@ bool PingPong::event(QEvent *)
         QEvent *e = new QEvent(QEvent::User);
         QCoreApplication::postEvent(m_peer, e);
     } else {
-        QCoreApplication::quit();
+        QTestEventLoop::instance().exitLoop();
     }
     return true;
 }
@@ -149,6 +150,10 @@ void EventsBench::sendEvent()
 void EventsBench::postEvent_data()
 {
     QTest::addColumn<bool>("filterEvents");
+    // The first time an eventloop is executed, the case runs radically slower at least
+    // on some platforms, so test the "no eventfilter" case to get a comparable results
+    // with the "eventfilter" case.
+    QTest::newRow("first time, no eventfilter") << false;
     QTest::newRow("no eventfilter") << false;
     QTest::newRow("eventfilter") << true;
 }
@@ -164,8 +169,14 @@ void EventsBench::postEvent()
         ping.installEventFilter(this);
         pong.installEventFilter(this);
     }
-    QEvent *e = new QEvent(QEvent::User);
+
     QBENCHMARK {
+        // In case multiple iterations are done, event needs to be created inside the QBENCHMARK,
+        // or it gets deleted once first iteration exits and can cause a crash. Similarly,
+        // ping and pong need their counters reset.
+        QEvent *e = new QEvent(QEvent::User);
+        ping.resetCounter();
+        pong.resetCounter();
         QCoreApplication::postEvent(&ping, e);
         QTestEventLoop::instance().enterLoop( 61 );
     }
diff --git a/tests/benchmarks/qbytearray/main.cpp b/tests/benchmarks/qbytearray/main.cpp
index 6a481f1a8e..78c5b160d8 100644
--- a/tests/benchmarks/qbytearray/main.cpp
+++ b/tests/benchmarks/qbytearray/main.cpp
@@ -73,6 +73,11 @@ void tst_qbytearray::append()
 {
     QFETCH(int, size);
 
+#ifdef Q_OS_SYMBIAN
+    if (size > 1000000)
+        QSKIP("Skipped due to limited memory in many Symbian devices.", SkipSingle);
+#endif
+
     QByteArray ba;
     QBENCHMARK {
         QByteArray ba2(size, 'x');
diff --git a/tests/benchmarks/qdiriterator/main.cpp b/tests/benchmarks/qdiriterator/main.cpp
index 2a400e3287..9e4e53e0c9 100644
--- a/tests/benchmarks/qdiriterator/main.cpp
+++ b/tests/benchmarks/qdiriterator/main.cpp
@@ -73,7 +73,7 @@ private slots:
 
 void tst_qdiriterator::data()
 {
-#ifdef Q_OS_WINCE
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QByteArray qtdir = qPrintable(QCoreApplication::applicationDirPath());
     qtdir += "/depot";
 #else
@@ -148,9 +148,9 @@ static int posix_helper(const char *dirpath)
 
     int count = 0;
     while ((entry = ::readdir(dir))) {
-        if (qstrcmp(entry->d_name, ".") == 0)  
+        if (qstrcmp(entry->d_name, ".") == 0)
             continue;
-        if (qstrcmp(entry->d_name, "..") == 0)  
+        if (qstrcmp(entry->d_name, "..") == 0)
             continue;
         ++count;
         QByteArray ba = dirpath;
@@ -198,7 +198,7 @@ void tst_qdiriterator::diriterator()
             //QDir::AllEntries | QDir::Hidden,
             QDir::Files,
             QDirIterator::Subdirectories);
-        
+
         while (dir.hasNext()) {
             dir.next();
             //printf("%s\n", qPrintable(dir.fileName()));
@@ -231,7 +231,7 @@ void tst_qdiriterator::fsiterator()
             //QDir::Files | QDir::NoDotAndDotDot,
             QDir::Files,
             QFileSystemIterator::Subdirectories);
-        
+
         for (; !dir.atEnd(); dir.next()) {
             dump && printf("%d %s\n",
                 dir.fileInfo().isDir(),
diff --git a/tests/benchmarks/qdiriterator/qdiriterator.pro b/tests/benchmarks/qdiriterator/qdiriterator.pro
index fb4b7535e9..e06d7467e4 100755
--- a/tests/benchmarks/qdiriterator/qdiriterator.pro
+++ b/tests/benchmarks/qdiriterator/qdiriterator.pro
@@ -15,7 +15,7 @@ SOURCES += main.cpp
 SOURCES += qfilesystemiterator.cpp
 HEADERS += qfilesystemiterator.h
 
-wince*: {
+wince*|symbian: {
    corelibdir.sources = $$QT_SOURCE_TREE/src/corelib
    corelibdir.path = ./depot/src
    DEPLOYMENT += corelibdir
diff --git a/tests/benchmarks/qfile/main.cpp b/tests/benchmarks/qfile/main.cpp
index d3f6ab59c6..421707734d 100644
--- a/tests/benchmarks/qfile/main.cpp
+++ b/tests/benchmarks/qfile/main.cpp
@@ -128,12 +128,18 @@ private:
     QString tmpDirName;
 };
 
+Q_DECLARE_METATYPE(tst_qfile::BenchmarkType)
+Q_DECLARE_METATYPE(QIODevice::OpenMode)
+Q_DECLARE_METATYPE(QIODevice::OpenModeFlag)
+
 void tst_qfile::createFile()
 {
+    removeFile();  // Cleanup in case previous test case aborted before cleaning up
+
     QTemporaryFile tmpFile;
     tmpFile.setAutoRemove(false);
     if (!tmpFile.open())
-        ::_exit(1);
+        ::exit(1);
     filename = tmpFile.fileName();
     tmpFile.close();
 }
@@ -217,7 +223,6 @@ void tst_qfile::readBigFile_data(BenchmarkType type, QIODevice::OpenModeFlag t,
 
     for (int i=0; i<bs_entries; ++i)
         QTest::newRow((QString("BS: %1, Flags: %2" )).arg(bs[i]).arg(flagstring).toLatin1().constData()) << type << bs[i] << t << b;
-  
 }
 
 void tst_qfile::readBigFile()
@@ -227,8 +232,12 @@ void tst_qfile::readBigFile()
     QFETCH(QFile::OpenModeFlag, textMode);
     QFETCH(QFile::OpenModeFlag, bufferedMode);
 
-    char buffer[BUFSIZE]; // we can't allocate buffers nice and dynamically in c++
-    removeFile();
+#ifndef Q_OS_WIN
+    if (testType == Win32Benchmark)
+        QSKIP("This is Windows only benchmark.", SkipSingle);
+#endif
+
+    char *buffer = new char[BUFSIZE];
     createFile();
     fillFile();
 
@@ -297,6 +306,9 @@ void tst_qfile::readBigFile()
         }
         break;
     }
+
+    removeFile();
+    delete[] buffer;
 }
 
 void tst_qfile::seek_data()
@@ -374,6 +386,8 @@ void tst_qfile::seek()
         }
         break;
     }
+
+    removeFile();
 }
 
 void tst_qfile::open_data()
@@ -392,7 +406,6 @@ void tst_qfile::open()
 {
     QFETCH(tst_qfile::BenchmarkType, testType);
 
-    removeFile();
     createFile();
 
     switch (testType) {
@@ -435,6 +448,7 @@ void tst_qfile::open()
                 file.open(cfile, QIODevice::ReadOnly);
                 file.close();
             }
+            ::fclose(cfile);
         }
         break;
         case(Win32Benchmark): {
@@ -456,6 +470,7 @@ void tst_qfile::open()
         break;
     }
 
+    removeFile();
 }
 
 
@@ -515,15 +530,20 @@ void tst_qfile::readSmallFiles_data(BenchmarkType type, QIODevice::OpenModeFlag
 void tst_qfile::createSmallFiles()
 {
     QDir dir = QDir::temp();
-    Q_ASSERT(dir.mkdir("tst"));
+    dir.mkdir("tst");
     dir.cd("tst");
     tmpDirName = dir.absolutePath();
 
+#ifdef Q_OS_SYMBIAN
+    for (int i = 0; i < 100; ++i)
+#else
     for (int i = 0; i < 1000; ++i)
+#endif
     {
         QFile f(tmpDirName+"/"+QString::number(i));
         f.open(QIODevice::WriteOnly);
-        f.seek(512);
+        f.seek(511);
+        f.putChar('\n');
         f.close();
     }
 }
@@ -544,17 +564,22 @@ void tst_qfile::readSmallFiles()
     QFETCH(QFile::OpenModeFlag, textMode);
     QFETCH(QFile::OpenModeFlag, bufferedMode);
 
-    removeSmallFiles();
+#ifndef Q_OS_WIN
+    if (testType == Win32Benchmark)
+        QSKIP("This is Windows only benchmark.", SkipSingle);
+#endif
+
     createSmallFiles();
+
     QDir dir(tmpDirName);
-    const QStringList files = dir.entryList(QDir::NoDotAndDotDot|QDir::NoSymLinks);
-    char buffer[BUFSIZE]; // we can't allocate buffers nice and dynamically in c++
+    const QStringList files = dir.entryList(QDir::NoDotAndDotDot|QDir::NoSymLinks|QDir::Files);
+    char *buffer = new char[BUFSIZE];
 
     switch (testType) {
         case(QFileBenchmark): {
             QList<QFile*> fileList;
             Q_FOREACH(QString file, files) {
-                QFile *f = new QFile(file);
+                QFile *f = new QFile(tmpDirName+ "/" + file);
                 f->open(QIODevice::ReadOnly|textMode|bufferedMode);
                 fileList.append(f);
             }
@@ -576,7 +601,7 @@ void tst_qfile::readSmallFiles()
         case(QFSFileEngineBenchmark): {
             QList<QFSFileEngine*> fileList;
             Q_FOREACH(QString file, files) {
-                QFSFileEngine *fse = new QFSFileEngine(file);
+                QFSFileEngine *fse = new QFSFileEngine(tmpDirName+ "/" + file);
                 fse->open(QIODevice::ReadOnly|textMode|bufferedMode);
                 fileList.append(fse);
             }
@@ -596,7 +621,7 @@ void tst_qfile::readSmallFiles()
         case(PosixBenchmark): {
             QList<FILE*> fileList;
             Q_FOREACH(QString file, files) {
-                fileList.append(::fopen(QFile::encodeName(file).constData(), "rb"));
+                fileList.append(::fopen(QFile::encodeName(tmpDirName+ "/" + file).constData(), "rb"));
             }
 
             QBENCHMARK {
@@ -640,11 +665,10 @@ void tst_qfile::readSmallFiles()
         }
         break;
     }
-}
 
-Q_DECLARE_METATYPE(tst_qfile::BenchmarkType)
-Q_DECLARE_METATYPE(QIODevice::OpenMode)
-Q_DECLARE_METATYPE(QIODevice::OpenModeFlag)
+    removeSmallFiles();
+    delete[] buffer;
+}
 
 QTEST_MAIN(tst_qfile)
 
diff --git a/tests/benchmarks/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/qgraphicsview/qgraphicsview.pro
index d9db8c9ae3..927d73129f 100644
--- a/tests/benchmarks/qgraphicsview/qgraphicsview.pro
+++ b/tests/benchmarks/qgraphicsview/qgraphicsview.pro
@@ -6,3 +6,11 @@ SOURCES += tst_qgraphicsview.cpp
 RESOURCES += qgraphicsview.qrc
 
 include(chiptester/chiptester.pri)
+
+symbian {
+   qt_not_deployed {
+      plugins.sources = qjpeg.dll
+      plugins.path = imageformats
+      DEPLOYMENT += plugins
+   }
+}
diff --git a/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp
index aadd56c8b2..cf65e5d3ca 100644
--- a/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp
@@ -62,25 +62,25 @@ class QEventWaiter : public QEventLoop
 {
 public:
     QEventWaiter(QObject *receiver, QEvent::Type type)
-	: waiting(false), t(type)
+        : waiting(false), t(type)
     {
-	receiver->installEventFilter(this);
+        receiver->installEventFilter(this);
     }
 
     void wait()
     {
-	waiting = true;
-	exec();
+        waiting = true;
+        exec();
     }
 
     bool eventFilter(QObject *receiver, QEvent *event)
     {
-	Q_UNUSED(receiver);
-	if (waiting && event->type() == t) {
-	    waiting = false;
-	    exit();
-	}
-	return false;
+        Q_UNUSED(receiver);
+        if (waiting && event->type() == t) {
+            waiting = false;
+            exit();
+        }
+        return false;
     }
 
 private:
@@ -166,20 +166,26 @@ void tst_QGraphicsView::paintSingleItem()
     QImage image(100, 100, QImage::Format_ARGB32_Premultiplied);
     QPainter painter(&image);
     QBENCHMARK {
-	view.viewport()->render(&painter);
+        view.viewport()->render(&painter);
     }
 }
 
+#ifdef Q_OS_SYMBIAN
+#  define DEEP_STACKING_COUNT 200
+#else
+#  define DEEP_STACKING_COUNT 1000
+#endif
+
 void tst_QGraphicsView::paintDeepStackingItems()
 {
     QGraphicsScene scene(0, 0, 100, 100);
     QGraphicsRectItem *item = scene.addRect(0, 0, 10, 10);
     QGraphicsRectItem *lastRect = item;
-    for (int i = 0; i < 1000; ++i) {
-	QGraphicsRectItem *rect = scene.addRect(0, 0, 10, 10);
-	rect->setPos(1, 1);
-	rect->setParentItem(lastRect);	
-	lastRect = rect;
+    for (int i = 0; i < DEEP_STACKING_COUNT; ++i) {
+        QGraphicsRectItem *rect = scene.addRect(0, 0, 10, 10);
+        rect->setPos(1, 1);
+        rect->setParentItem(lastRect);
+        lastRect = rect;
     }
 
     QGraphicsView view(&scene);
@@ -192,7 +198,7 @@ void tst_QGraphicsView::paintDeepStackingItems()
     QImage image(100, 100, QImage::Format_ARGB32_Premultiplied);
     QPainter painter(&image);
     QBENCHMARK {
-	view.viewport()->render(&painter);
+        view.viewport()->render(&painter);
     }
 }
 
@@ -202,11 +208,11 @@ void tst_QGraphicsView::paintDeepStackingItems_clipped()
     QGraphicsRectItem *item = scene.addRect(0, 0, 10, 10);
     item->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
     QGraphicsRectItem *lastRect = item;
-    for (int i = 0; i < 1000; ++i) {
-	QGraphicsRectItem *rect = scene.addRect(0, 0, 10, 10);
-	rect->setPos(1, 1);
-	rect->setParentItem(lastRect);	
-	lastRect = rect;
+    for (int i = 0; i < DEEP_STACKING_COUNT; ++i) {
+        QGraphicsRectItem *rect = scene.addRect(0, 0, 10, 10);
+        rect->setPos(1, 1);
+        rect->setParentItem(lastRect);
+        lastRect = rect;
     }
 
     QGraphicsView view(&scene);
@@ -219,7 +225,7 @@ void tst_QGraphicsView::paintDeepStackingItems_clipped()
     QImage image(100, 100, QImage::Format_ARGB32_Premultiplied);
     QPainter painter(&image);
     QBENCHMARK {
-	view.viewport()->render(&painter);
+        view.viewport()->render(&painter);
     }
 }
 
@@ -239,8 +245,8 @@ void tst_QGraphicsView::moveSingleItem()
     int n = 1;
     QBENCHMARK {
         item->setPos(25 * n, 25 * n);
-	waiter.wait();
-	n = n ? 0 : 1;
+        waiter.wait();
+        n = n ? 0 : 1;
     }
 }
 
@@ -382,18 +388,18 @@ void tst_QGraphicsView::chipTester()
     tester.setOpenGL(opengl);
     tester.setOperation(ChipTester::Operation(operation));
     QBENCHMARK {
-	tester.runBenchmark();
+        tester.runBenchmark();
     }
 }
 
 static void addChildHelper(QGraphicsItem *parent, int n, bool rotate)
 {
     if (!n)
-	return;
+        return;
     QGraphicsRectItem *item = new QGraphicsRectItem(QRectF(0, 0, 50, 50), parent);
     item->setPos(10, 10);
     if (rotate)
-	item->rotate(10);
+        item->rotate(10);
     addChildHelper(item, n - 1, rotate);
 }
 
@@ -421,12 +427,12 @@ void tst_QGraphicsView::deepNesting()
 
     QGraphicsScene scene;
     for (int y = 0; y < 15; ++y) {
-	for (int x = 0; x < 15; ++x) {
-	    QGraphicsItem *item1 = scene.addRect(QRectF(0, 0, 50, 50));
-	    if (rotate) item1->rotate(10);
-	    item1->setPos(x * 25, y * 25);
-	    addChildHelper(item1, 30, rotate);
-	}
+        for (int x = 0; x < 15; ++x) {
+            QGraphicsItem *item1 = scene.addRect(QRectF(0, 0, 50, 50));
+            if (rotate) item1->rotate(10);
+            item1->setPos(x * 25, y * 25);
+            addChildHelper(item1, 30, rotate);
+        }
     }
     scene.setItemIndexMethod(bsp ? QGraphicsScene::BspTreeIndex : QGraphicsScene::NoIndex);
     scene.setSortCacheEnabled(sortCache);
@@ -441,11 +447,11 @@ void tst_QGraphicsView::deepNesting()
 
     QBENCHMARK {
 #ifdef CALLGRIND_DEBUG
-	CALLGRIND_START_INSTRUMENTATION
+        CALLGRIND_START_INSTRUMENTATION
 #endif
-	view.viewport()->repaint();
+        view.viewport()->repaint();
 #ifdef CALLGRIND_DEBUG
-	CALLGRIND_STOP_INSTRUMENTATION
+        CALLGRIND_STOP_INSTRUMENTATION
 #endif
     }
 }
@@ -456,36 +462,36 @@ public:
     AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0)
         : QGraphicsPixmapItem(parent), rotateFactor(0), scaleFactor(0)
     {
-	rotate = rot;
-	scale = scal;
-	xspeed = x;
-	yspeed = y;
+        rotate = rot;
+        scale = scal;
+        xspeed = x;
+        yspeed = y;
     }
 
 protected:
     void advance(int i)
-    { 
-	if (!i)
-	    return;
-	int x = int(pos().x()) + pixmap().width();
-	x += xspeed;
-	x = (x % (300 + pixmap().width() * 2)) - pixmap().width();
-	int y = int(pos().y()) + pixmap().width();
-	y += yspeed;
-	y = (y % (300 + pixmap().width() * 2)) - pixmap().width();
-	setPos(x, y);
-
-	int rot = rotateFactor;
-	int sca = scaleFactor;
+    {
+        if (!i)
+            return;
+        int x = int(pos().x()) + pixmap().width();
+        x += xspeed;
+        x = (x % (300 + pixmap().width() * 2)) - pixmap().width();
+        int y = int(pos().y()) + pixmap().width();
+        y += yspeed;
+        y = (y % (300 + pixmap().width() * 2)) - pixmap().width();
+        setPos(x, y);
+
+        int rot = rotateFactor;
+        int sca = scaleFactor;
         if (rotate)
-	    rotateFactor = 1 + (rot + xspeed) % 360;
+            rotateFactor = 1 + (rot + xspeed) % 360;
         if (scale)
-	    scaleFactor = 1 + (sca + yspeed) % 50;
+            scaleFactor = 1 + (sca + yspeed) % 50;
 
-	if (rotate || scale) {
-	    qreal s = 0.5 + scaleFactor / 50.0;
-	    setTransform(QTransform().rotate(rotateFactor).scale(s, s));
-	}
+        if (rotate || scale) {
+            qreal s = 0.5 + scaleFactor / 50.0;
+            setTransform(QTransform().rotate(rotateFactor).scale(s, s));
+        }
     }
 
 private:
@@ -543,38 +549,38 @@ void tst_QGraphicsView::imageRiver()
     view.show();
 
     QPixmap pix(":/images/designer.png");
-    QVERIFY(!pix.isNull());   
+    QVERIFY(!pix.isNull());
 
     QList<QGraphicsItem *> items;
     QFile file(":/random.data");
     QVERIFY(file.open(QIODevice::ReadOnly));
     QDataStream str(&file);
     for (int i = 0; i < 100; ++i) {
-	AnimatedPixmapItem *item;
-	if (direction == 0) item = new AnimatedPixmapItem((i % 4) + 1, 0, rotation, scale);
-	if (direction == 1) item = new AnimatedPixmapItem(0, (i % 4) + 1, rotation, scale);
-	if (direction == 2) item = new AnimatedPixmapItem((i % 4) + 1, (i % 4) + 1, rotation, scale);
-	item->setPixmap(pix);
+        AnimatedPixmapItem *item;
+        if (direction == 0) item = new AnimatedPixmapItem((i % 4) + 1, 0, rotation, scale);
+        if (direction == 1) item = new AnimatedPixmapItem(0, (i % 4) + 1, rotation, scale);
+        if (direction == 2) item = new AnimatedPixmapItem((i % 4) + 1, (i % 4) + 1, rotation, scale);
+        item->setPixmap(pix);
         int rnd1, rnd2;
         str >> rnd1 >> rnd2;
-	item->setPos(-pix.width() + rnd1 % (view.width() + pix.width()),
-		     -pix.height() + rnd2 % (view.height() + pix.height()));
-	scene.addItem(item);
+        item->setPos(-pix.width() + rnd1 % (view.width() + pix.width()),
+                     -pix.height() + rnd2 % (view.height() + pix.height()));
+        scene.addItem(item);
     }
 
     view.count = 0;
 
     QBENCHMARK {
 #ifdef CALLGRIND_DEBUG
-	CALLGRIND_START_INSTRUMENTATION
+        CALLGRIND_START_INSTRUMENTATION
 #endif
-	for (int i = 0; i < 100; ++i) {
-	    scene.advance();
-	    while (view.count < (i+1))
-		qApp->processEvents();
-	}
+        for (int i = 0; i < 100; ++i) {
+            scene.advance();
+            while (view.count < (i+1))
+                qApp->processEvents();
+        }
 #ifdef CALLGRIND_DEBUG
-	CALLGRIND_STOP_INSTRUMENTATION
+        CALLGRIND_STOP_INSTRUMENTATION
 #endif
     }
 }
@@ -585,38 +591,38 @@ public:
     AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0)
         : QGraphicsSimpleTextItem(parent), rotateFactor(0), scaleFactor(25)
     {
-	setText("River of text");
-	rotate = rot;
-	scale = scal;
-	xspeed = x;
-	yspeed = y;
+        setText("River of text");
+        rotate = rot;
+        scale = scal;
+        xspeed = x;
+        yspeed = y;
     }
 
 protected:
     void advance(int i)
-    { 
-	if (!i)
-	    return;
-	QRect r = boundingRect().toRect();
-	int x = int(pos().x()) + r.width();
-	x += xspeed;
-	x = (x % (300 + r.width() * 2)) - r.width();
-	int y = int(pos().y()) + r.width();
-	y += yspeed;
-	y = (y % (300 + r.width() * 2)) - r.width();
-	setPos(x, y);
-
-	int rot = rotateFactor;
-	int sca = scaleFactor;
+    {
+        if (!i)
+            return;
+        QRect r = boundingRect().toRect();
+        int x = int(pos().x()) + r.width();
+        x += xspeed;
+        x = (x % (300 + r.width() * 2)) - r.width();
+        int y = int(pos().y()) + r.width();
+        y += yspeed;
+        y = (y % (300 + r.width() * 2)) - r.width();
+        setPos(x, y);
+
+        int rot = rotateFactor;
+        int sca = scaleFactor;
         if (rotate)
-	    rotateFactor = 1 + (rot + xspeed) % 360;
+            rotateFactor = 1 + (rot + xspeed) % 360;
         if (scale)
-	    scaleFactor = 1 + (sca + yspeed) % 50;
+            scaleFactor = 1 + (sca + yspeed) % 50;
 
-	if (rotate || scale) {
-	    qreal s = 0.5 + scaleFactor / 50.0;
-	    setTransform(QTransform().rotate(rotateFactor).scale(s, s));
-	}
+        if (rotate || scale) {
+            qreal s = 0.5 + scaleFactor / 50.0;
+            setTransform(QTransform().rotate(rotateFactor).scale(s, s));
+        }
     }
 
 private:
@@ -657,37 +663,37 @@ void tst_QGraphicsView::textRiver()
     view.show();
 
     QPixmap pix(":/images/designer.png");
-    QVERIFY(!pix.isNull());   
+    QVERIFY(!pix.isNull());
 
     QList<QGraphicsItem *> items;
     QFile file(":/random.data");
     QVERIFY(file.open(QIODevice::ReadOnly));
     QDataStream str(&file);
     for (int i = 0; i < 100; ++i) {
-	AnimatedTextItem *item;
-	if (direction == 0) item = new AnimatedTextItem((i % 4) + 1, 0, rotation, scale);
-	if (direction == 1) item = new AnimatedTextItem(0, (i % 4) + 1, rotation, scale);
-	if (direction == 2) item = new AnimatedTextItem((i % 4) + 1, (i % 4) + 1, rotation, scale);
+        AnimatedTextItem *item;
+        if (direction == 0) item = new AnimatedTextItem((i % 4) + 1, 0, rotation, scale);
+        if (direction == 1) item = new AnimatedTextItem(0, (i % 4) + 1, rotation, scale);
+        if (direction == 2) item = new AnimatedTextItem((i % 4) + 1, (i % 4) + 1, rotation, scale);
         int rnd1, rnd2;
         str >> rnd1 >> rnd2;
-	item->setPos(-pix.width() + rnd1 % (view.width() + pix.width()),
-		     -pix.height() + rnd2 % (view.height() + pix.height()));
-	scene.addItem(item);
+        item->setPos(-pix.width() + rnd1 % (view.width() + pix.width()),
+                     -pix.height() + rnd2 % (view.height() + pix.height()));
+        scene.addItem(item);
     }
 
     view.count = 0;
 
     QBENCHMARK {
 #ifdef CALLGRIND_DEBUG
-	CALLGRIND_START_INSTRUMENTATION
+        CALLGRIND_START_INSTRUMENTATION
 #endif
-	for (int i = 0; i < 100; ++i) {
-	    scene.advance();
-	    while (view.count < (i+1))
-		qApp->processEvents();
-	}
+        for (int i = 0; i < 100; ++i) {
+            scene.advance();
+            while (view.count < (i+1))
+                qApp->processEvents();
+        }
 #ifdef CALLGRIND_DEBUG
-	CALLGRIND_STOP_INSTRUMENTATION
+        CALLGRIND_STOP_INSTRUMENTATION
 #endif
     }
 }
diff --git a/tests/benchmarks/qstringlist/qstringlist.pro b/tests/benchmarks/qstringlist/qstringlist.pro
index f9ebd59a02..11cceb0207 100644
--- a/tests/benchmarks/qstringlist/qstringlist.pro
+++ b/tests/benchmarks/qstringlist/qstringlist.pro
@@ -2,3 +2,5 @@ load(qttest_p4)
 TARGET = tst_qstringlist
 QT -= gui
 SOURCES += main.cpp
+
+symbian: LIBS += -llibpthread
diff --git a/tests/benchmarks/qstylesheetstyle/main.cpp b/tests/benchmarks/qstylesheetstyle/main.cpp
index 19efcabe78..d6fa48ccd3 100644
--- a/tests/benchmarks/qstylesheetstyle/main.cpp
+++ b/tests/benchmarks/qstylesheetstyle/main.cpp
@@ -49,16 +49,16 @@ class tst_qstylesheetstyle : public QObject
 private slots:
     void empty();
     void empty_events();
-    
+
     void simple();
     void simple_events();
-    
+
     void grid_data();
     void grid();
-    
+
 private:
     QWidget *buildSimpleWidgets();
-    
+
 };
 
 
@@ -103,7 +103,7 @@ void tst_qstylesheetstyle::empty_events()
     delete w;
 }
 
-static const char *simple_css = 
+static const char *simple_css =
    " QLineEdit { background: red; }   QPushButton { border: 1px solid yellow; color: pink; }  \n"
    " QCheckBox { margin: 3px 5px; background-color:red; } QAbstractButton { background-color: #456; } \n"
    " QFrame { padding: 3px; } QLabel { color: black } QSpinBox:hover { background-color:blue; }  ";
@@ -138,7 +138,7 @@ void tst_qstylesheetstyle::grid_data()
         QTest::addColumn<bool>("events");
         QTest::addColumn<bool>("show");
         QTest::addColumn<int>("N");
-        for (int n = 5; n <= 25; n += 5) { 
+        for (int n = 5; n <= 25; n += 5) {
            const QByteArray nString = QByteArray::number(n*n);
             QTest::newRow(("simple--" + nString).constData()) << false << false << n;
             QTest::newRow(("events--" + nString).constData()) << true << false << n;
@@ -153,6 +153,13 @@ void tst_qstylesheetstyle::grid()
     QFETCH(bool, show);
     QFETCH(int, N);
 
+#ifdef Q_OS_SYMBIAN
+    // Symbian has limited stack (max 80k), which will run out when N >= 20 due to
+    // QWidget::show() using recursion among grid labels somewhere down the line.
+    if (show && N >= 20)
+        QSKIP("Grid too big for device to show", SkipSingle);
+#endif
+
     QWidget *w = new QWidget();
     QGridLayout *layout = new QGridLayout(w);
     w->setLayout(layout);
diff --git a/tests/manual/qgraphicsitemgroup/customitem.cpp b/tests/manual/qgraphicsitemgroup/customitem.cpp
new file mode 100644
index 0000000000..16da0c5f7f
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/customitem.cpp
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 "customitem.h"
+
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOption>
+
+QList<CustomGroup*> CustomScene::selectedCustomGroups() const
+{
+    QList<QGraphicsItem*> all = selectedItems();
+    QList<CustomGroup*> groups;
+
+    foreach (QGraphicsItem *item, all) {
+        CustomGroup* group = dynamic_cast<CustomGroup*>(item);
+        if (group)
+            groups.append(group);
+    }
+
+    return groups;
+}
+
+QList<CustomItem*> CustomScene::selectedCustomItems() const
+{
+    QList<QGraphicsItem*> all = selectedItems();
+    QList<CustomItem*> items;
+
+    foreach (QGraphicsItem *item, all) {
+        CustomItem* citem = dynamic_cast<CustomItem*>(item);
+        if (citem)
+            items.append(citem);
+    }
+
+    return items;
+}
+
+CustomGroup::CustomGroup() :
+    QGraphicsItemGroup()
+{
+    setFlag(QGraphicsItem::ItemIsMovable);
+    setFlag(QGraphicsItem::ItemIsSelectable);
+}
+
+void CustomGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    if (option->state & QStyle::State_Selected)
+        painter->setOpacity(1.);
+    else
+        painter->setOpacity(0.2);
+
+    painter->setPen(QPen(QColor(100, 100, 100), 2, Qt::DashLine));
+    painter->drawRect(boundingRect().adjusted(-2, -2, 2, 2));
+}
+
+QRectF CustomGroup::boundingRect() const
+{
+    return QGraphicsItemGroup::boundingRect().adjusted(-4, -4, 4 ,4);
+}
+
+CustomItem::CustomItem(qreal x, qreal y, qreal width, qreal height, const QBrush &brush) :
+    QGraphicsRectItem(x, y, width, height)
+{
+    setFlag(QGraphicsItem::ItemIsMovable);
+    setFlag(QGraphicsItem::ItemIsSelectable);
+    setBrush(brush);
+    setPen(Qt::NoPen);
+    setTransformOriginPoint(boundingRect().center());
+}
diff --git a/tests/manual/qgraphicsitemgroup/customitem.h b/tests/manual/qgraphicsitemgroup/customitem.h
new file mode 100644
index 0000000000..387c8ce705
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/customitem.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 CUSTOMITEM_H
+#define CUSTOMITEM_H
+
+#include <QGraphicsItem>
+#include <QBrush>
+#include <QGraphicsScene>
+
+class CustomGroup : public QGraphicsItemGroup
+{
+public:
+    CustomGroup();
+    virtual ~CustomGroup() { }
+
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual QRectF boundingRect() const;
+};
+
+class CustomItem : public QGraphicsRectItem
+{
+public:
+    CustomItem(qreal x, qreal y, qreal width, qreal height, const QBrush & brush = QBrush());
+    virtual ~CustomItem() { }
+};
+
+class CustomScene : public QGraphicsScene
+{
+    Q_OBJECT
+public:
+    CustomScene() : QGraphicsScene() { }
+
+    QList<CustomItem*> selectedCustomItems() const;
+    QList<CustomGroup*> selectedCustomGroups() const;
+};
+
+#endif // CUSTOMITEM_H
diff --git a/tests/manual/qgraphicsitemgroup/main.cpp b/tests/manual/qgraphicsitemgroup/main.cpp
new file mode 100644
index 0000000000..e7a6e119f3
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 <QtGui/QApplication>
+#include "widget.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    Widget w;
+    w.show();
+    return a.exec();
+}
diff --git a/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro b/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro
new file mode 100644
index 0000000000..6676a2e7c1
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/qgraphicsitemgroup.pro
@@ -0,0 +1,8 @@
+TARGET = qgraphicsitemgroup
+TEMPLATE = app
+SOURCES += main.cpp \
+    widget.cpp \
+    customitem.cpp
+HEADERS += widget.h \
+    customitem.h
+FORMS += widget.ui
diff --git a/tests/manual/qgraphicsitemgroup/widget.cpp b/tests/manual/qgraphicsitemgroup/widget.cpp
new file mode 100644
index 0000000000..23bee3f9d1
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/widget.cpp
@@ -0,0 +1,260 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 "widget.h"
+#include "ui_widget.h"
+#include <QGraphicsOpacityEffect>
+#include <QPropertyAnimation>
+
+Widget::Widget(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::Widget),
+    previousSelectionCount(0)
+{
+    ui->setupUi(this);
+
+    effect = new QGraphicsOpacityEffect;
+    effect->setOpacity(0.3);
+    ui->groupBox->setGraphicsEffect(effect);
+
+    fadeIn = new QPropertyAnimation(effect, "opacity");
+    fadeIn->setDuration(200);
+    fadeIn->setStartValue(0.3);
+    fadeIn->setEndValue(1.);
+
+    fadeOut = new QPropertyAnimation(effect, "opacity");
+    fadeOut->setDuration(200);
+    fadeOut->setStartValue(1.);
+    fadeOut->setEndValue(0.3);
+
+    scene = new CustomScene;
+    scene->setSceneRect(-250,-250,500,500);
+    ui->view->setScene(scene);
+    scene->setBackgroundBrush(Qt::white);
+    ui->view->setInteractive(true);
+    ui->view->setDragMode(QGraphicsView::RubberBandDrag);
+    ui->view->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    ui->view->setRenderHints( QPainter::SmoothPixmapTransform |
+                              QPainter::TextAntialiasing |
+                              QPainter::Antialiasing );
+
+    rectBlue = new CustomItem(-100, -100, 50, 50, QColor(80, 80, 200));
+    scene->addItem(rectBlue);
+    rectGreen = new CustomItem(100, -100, 50, 50, QColor(80, 200, 80));
+    scene->addItem(rectGreen);
+    rectRed = new CustomItem(-100, 100, 50, 50, QColor(200, 80, 80));
+    scene->addItem(rectRed);
+    rectYellow = new CustomItem(100, 100, 50, 50, QColor(200, 200, 20));
+    scene->addItem(rectYellow);
+
+    connect(scene, SIGNAL(selectionChanged()), this, SLOT(onSceneSelectionChanged()));
+}
+
+Widget::~Widget()
+{
+    delete ui;
+    delete fadeIn;
+    delete fadeOut;
+}
+
+void Widget::on_rotate_valueChanged(int value)
+{
+    if (scene->selectedItems().count() != 1)
+        return;
+
+    QGraphicsItem *item = scene->selectedItems().at(0);
+    item->setRotation(value);
+    ui->rotateItem->setValue(checkedItem()->rotation());
+}
+
+void Widget::on_scale_valueChanged(int value)
+{
+    if (scene->selectedItems().count() != 1)
+        return;
+
+    QGraphicsItem *item = scene->selectedItems().at(0);
+    item->setScale(value / 10.);
+    ui->scaleItem->setValue(checkedItem()->scale() * 10);
+}
+
+void Widget::on_rotateItem_valueChanged(int value)
+{
+    if (!scene->selectedItems().empty() && scene->selectedItems().at(0) == checkedItem())
+        ui->rotate->setValue(value);
+    else
+        checkedItem()->setRotation(value);
+}
+
+void Widget::on_scaleItem_valueChanged(int value)
+{
+    if (!scene->selectedItems().empty() && scene->selectedItems().at(0) == checkedItem())
+        ui->scale->setValue(value);
+    else
+        checkedItem()->setScale(value / 10.);
+}
+
+void Widget::on_group_clicked()
+{
+    QList<QGraphicsItem*> all = scene->selectedItems();
+    if (all.size() < 2)
+        return;
+
+    QList<CustomItem*> items = scene->selectedCustomItems();
+    QList<CustomGroup*> groups = scene->selectedCustomGroups();
+
+    if (groups.size() == 1) {
+        foreach (CustomItem *item, items) {
+            item->setSelected(false);
+            groups[0]->addToGroup(item);
+        }
+
+        return;
+    }
+
+    CustomGroup* group = new CustomGroup;
+    scene->addItem(group);
+    foreach (QGraphicsItem *item, all) {
+        item->setSelected(false);
+        group->addToGroup(item);
+    }
+    group->setSelected(true);
+
+    updateUngroupButton();
+}
+
+void Widget::on_dismantle_clicked()
+{
+    QList<CustomGroup*> groups = scene->selectedCustomGroups();
+
+    foreach (CustomGroup *group, groups) {
+        foreach (QGraphicsItem *item, group->childItems())
+            group->removeFromGroup(item);
+
+        delete group;
+    }
+
+    updateUngroupButton();
+}
+
+void Widget::on_merge_clicked()
+{
+    QList<CustomGroup*> groups = scene->selectedCustomGroups();
+    if (groups.size() < 2)
+        return;
+
+    CustomGroup *newBigGroup = groups.takeFirst();
+    foreach (CustomGroup *group, groups) {
+        foreach (QGraphicsItem *item, group->childItems())
+            item->setGroup(newBigGroup);
+
+        delete group;
+    }
+}
+
+void Widget::onSceneSelectionChanged()
+{
+    QList<QGraphicsItem*> all = scene->selectedItems();
+    QList<CustomGroup*> groups = scene->selectedCustomGroups();
+
+    if (all.empty() && all.count() != previousSelectionCount) {
+        fadeOut->start();
+    } else if (previousSelectionCount == 0) {
+        fadeIn->start();
+    }
+
+    if (all.count() == 1) {
+        QGraphicsItem *item = all.at(0);
+        ui->rotate->setValue(item->rotation());
+        ui->scale->setValue(item->scale() * 10);
+    } else {
+        ui->rotate->setValue(ui->rotate->minimum());
+        ui->scale->setValue(ui->scale->minimum());
+    }
+
+    ui->rotate->setEnabled(all.size() == 1);
+    ui->scale->setEnabled(all.size() == 1);
+    ui->group->setEnabled(all.size() > 1);
+    ui->dismantle->setEnabled(!groups.empty());
+    ui->merge->setEnabled(groups.size() > 1);
+
+    previousSelectionCount = all.size();
+
+    updateUngroupButton();
+}
+
+void Widget::on_ungroup_clicked()
+{
+    QGraphicsItemGroup *oldGroup = checkedItem()->group();
+    checkedItem()->setGroup(0);
+    if (oldGroup && oldGroup->childItems().empty())
+        delete oldGroup;
+
+    updateUngroupButton();
+}
+
+void Widget::updateUngroupButton()
+{
+    ui->ungroup->setEnabled(checkedItem()->group() != 0);
+}
+
+CustomItem * Widget::checkedItem() const
+{
+    CustomItem *item;
+
+    if (ui->blue->isChecked())
+        item = rectBlue;
+    else if (ui->red->isChecked())
+        item = rectRed;
+    else if (ui->green->isChecked())
+        item = rectGreen;
+    else if (ui->yellow->isChecked())
+        item = rectYellow;
+
+    return item;
+}
+
+void Widget::on_buttonGroup_buttonClicked()
+{
+    ui->rotateItem->setValue(checkedItem()->rotation());
+    ui->scaleItem->setValue(checkedItem()->scale() * 10);
+
+    updateUngroupButton();
+}
diff --git a/tests/manual/qgraphicsitemgroup/widget.h b/tests/manual/qgraphicsitemgroup/widget.h
new file mode 100644
index 0000000000..affc436c39
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/widget.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 WIDGET_H
+#define WIDGET_H
+
+#include "customitem.h"
+
+#include <QWidget>
+#include <QGraphicsItemGroup>
+#include <QPainter>
+
+namespace Ui {
+    class Widget;
+}
+
+class QGraphicsOpacityEffect;
+class QPropertyAnimation;
+
+class Widget : public QWidget
+{
+    Q_OBJECT
+public:
+    Widget(QWidget *parent = 0);
+    ~Widget();
+
+protected Q_SLOTS:
+    void on_rotate_valueChanged(int value);
+    void on_scale_valueChanged(int value);
+    void on_rotateItem_valueChanged(int value);
+    void on_scaleItem_valueChanged(int value);
+    void on_group_clicked();
+    void on_dismantle_clicked();
+    void on_merge_clicked();
+    void onSceneSelectionChanged();
+    void on_ungroup_clicked();
+    void on_buttonGroup_buttonClicked();
+
+private:
+    void updateUngroupButton();
+    CustomItem * checkedItem() const;
+
+    Ui::Widget *ui;
+    CustomScene *scene;
+    CustomItem *rectBlue;
+    CustomItem *rectRed;
+    CustomItem *rectGreen;
+    CustomItem *rectYellow;
+    QGraphicsOpacityEffect* effect;
+    QPropertyAnimation *fadeIn;
+    QPropertyAnimation *fadeOut;
+    int previousSelectionCount;
+};
+
+#endif // WIDGET_H
diff --git a/tests/manual/qgraphicsitemgroup/widget.ui b/tests/manual/qgraphicsitemgroup/widget.ui
new file mode 100644
index 0000000000..7e3a4dfaae
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/widget.ui
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Widget</class>
+ <widget class="QWidget" name="Widget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>782</width>
+    <height>695</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="title">
+        <string>Items</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_6">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_4">
+            <item>
+             <widget class="QRadioButton" name="blue">
+              <property name="text">
+               <string>Blue</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+              <attribute name="buttonGroup">
+               <string>buttonGroup</string>
+              </attribute>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="red">
+              <property name="text">
+               <string>Red</string>
+              </property>
+              <attribute name="buttonGroup">
+               <string>buttonGroup</string>
+              </attribute>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="green">
+              <property name="text">
+               <string>Green</string>
+              </property>
+              <attribute name="buttonGroup">
+               <string>buttonGroup</string>
+              </attribute>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="yellow">
+              <property name="text">
+               <string>Yellow</string>
+              </property>
+              <attribute name="buttonGroup">
+               <string>buttonGroup</string>
+              </attribute>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_5">
+            <item>
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>Rotate</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSlider" name="rotateItem">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>120</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximum">
+               <number>360</number>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>Scale</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSlider" name="scaleItem">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>120</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="minimum">
+               <number>5</number>
+              </property>
+              <property name="maximum">
+               <number>30</number>
+              </property>
+              <property name="value">
+               <number>10</number>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QPushButton" name="ungroup">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Ungroup</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>50</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>300</width>
+         <height>164</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>300</width>
+         <height>164</height>
+        </size>
+       </property>
+       <property name="title">
+        <string>Selection</string>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Rotate</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSlider" name="rotate">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>120</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="maximum">
+             <number>360</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Scale</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSlider" name="scale">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>120</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="minimum">
+             <number>5</number>
+            </property>
+            <property name="maximum">
+             <number>30</number>
+            </property>
+            <property name="value">
+             <number>10</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QPushButton" name="group">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Group</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="merge">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Merge Groups</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="dismantle">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Dismantle Group</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="view"/>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+ <buttongroups>
+  <buttongroup name="buttonGroup"/>
+ </buttongroups>
+</ui>
diff --git a/tools/assistant/lib/qhelpindexwidget.cpp b/tools/assistant/lib/qhelpindexwidget.cpp
index 475a1fe06e..6cf1a72559 100644
--- a/tools/assistant/lib/qhelpindexwidget.cpp
+++ b/tools/assistant/lib/qhelpindexwidget.cpp
@@ -130,6 +130,7 @@ void QHelpIndexProvider::stopCollecting()
     m_abort = true;
     m_mutex.unlock();
     wait();
+    m_abort = false;
 }
 
 QStringList QHelpIndexProvider::indices() const
@@ -164,7 +165,6 @@ void QHelpIndexProvider::run()
     foreach (QString dbFileName, m_helpEngine->fileNameReaderMap.keys()) {
         m_mutex.lock();
         if (m_abort) {
-            m_abort = false;
             m_mutex.unlock();
             return;
         }
@@ -181,7 +181,6 @@ void QHelpIndexProvider::run()
             foreach (QString s, lst)
                 indicesSet.insert(s);
             if (m_abort) {
-                m_abort = false;
                 m_mutex.unlock();
                 return;
             }
@@ -194,7 +193,6 @@ void QHelpIndexProvider::run()
     m_mutex.lock();
     m_indices = indicesSet.values();
     qSort(m_indices.begin(), m_indices.end(), caseInsensitiveLessThan);
-    m_abort = false;
     m_mutex.unlock();
 }
 
diff --git a/tools/assistant/lib/qhelpsearchengine.h b/tools/assistant/lib/qhelpsearchengine.h
index 21f04c5420..632ac0b5a5 100644
--- a/tools/assistant/lib/qhelpsearchengine.h
+++ b/tools/assistant/lib/qhelpsearchengine.h
@@ -86,7 +86,9 @@ public:
     QHelpSearchQueryWidget* queryWidget();
     QHelpSearchResultWidget* resultWidget();
 
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int hitsCount() const;
+#endif
     int hitCount() const;
 
     typedef QPair<QString, QString> SearchHit;
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 70f3157667..523525ed11 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -69,9 +69,12 @@ BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
     , m_title(title)
     , bookmarkManager(manager)
 {
+    ui.setupUi(this);
+
     installEventFilter(this);
+    ui.treeView->installEventFilter(this);
+    ui.treeView->viewport()->installEventFilter(this);
 
-    ui.setupUi(this);
     ui.bookmarkEdit->setText(title);
     ui.newFolderButton->setVisible(false);
     ui.buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
@@ -264,12 +267,14 @@ void BookmarkDialog::currentChanged(const QModelIndex &current)
 
 bool BookmarkDialog::eventFilter(QObject *object, QEvent *e)
 {
-    if (object == this && e->type() == QEvent::KeyPress) {
-        QKeyEvent *ke = static_cast<QKeyEvent*>(e);
+    if (object != ui.treeView && object != ui.treeView->viewport())
+        return QWidget::eventFilter(object, e);
 
-        QModelIndex index = ui.treeView->currentIndex();
+    if (e->type() == QEvent::KeyPress) {
+        QKeyEvent *ke = static_cast<QKeyEvent*>(e);
         switch (ke->key()) {
             case Qt::Key_F2: {
+                const QModelIndex &index = ui.treeView->currentIndex();
                 const QModelIndex &source = proxyModel->mapToSource(index);
                 QStandardItem *item =
                     bookmarkManager->treeBookmarkModel()->itemFromIndex(source);
@@ -281,13 +286,13 @@ bool BookmarkDialog::eventFilter(QObject *object, QEvent *e)
             }   break;
 
             case Qt::Key_Delete: {
+                const QModelIndex &index = ui.treeView->currentIndex();
                 bookmarkManager->removeBookmarkItem(ui.treeView,
                     proxyModel->mapToSource(index));
                 ui.bookmarkFolders->clear();
                 ui.bookmarkFolders->addItems(bookmarkManager->bookmarkFolders());
 
                 QString name = tr("Bookmarks");
-                index = ui.treeView->currentIndex();
                 if (index.isValid())
                     name = index.data().toString();
                 ui.bookmarkFolders->setCurrentIndex(ui.bookmarkFolders->findText(name));
@@ -297,6 +302,7 @@ bool BookmarkDialog::eventFilter(QObject *object, QEvent *e)
                 break;
         }
     }
+
     return QObject::eventFilter(object, e);
 }
 
@@ -312,7 +318,10 @@ BookmarkWidget::BookmarkWidget(BookmarkManager *manager, QWidget *parent,
     , bookmarkManager(manager)
 {
     setup(showButtons);
+
     installEventFilter(this);
+    treeView->installEventFilter(this);
+    treeView->viewport()->installEventFilter(this);
 }
 
 BookmarkWidget::~BookmarkWidget()
@@ -484,7 +493,6 @@ void BookmarkWidget::setup(bool showButtons)
     treeView->setAutoExpandDelay(1000);
     treeView->setDropIndicatorShown(true);
     treeView->header()->setVisible(false);
-    treeView->viewport()->installEventFilter(this);
     treeView->setContextMenuPolicy(Qt::CustomContextMenu);
 
     connect(treeView, SIGNAL(expanded(QModelIndex)), this,
@@ -530,59 +538,71 @@ void BookmarkWidget::focusInEvent(QFocusEvent *e)
 
 bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
 {
-    if ((object == this) || (object == treeView->viewport())) {
-        QModelIndex index = treeView->currentIndex();
-        if (e->type() == QEvent::KeyPress) {
-            QKeyEvent *ke = static_cast<QKeyEvent*>(e);
-            if (index.isValid() && searchField->text().isEmpty()) {
+    if (object != this && object != treeView
+        && object != treeView->viewport()) {
+            return QWidget::eventFilter(object, e);
+    }
+
+    if (e->type() == QEvent::KeyPress) {
+        QKeyEvent *ke = static_cast<QKeyEvent*>(e);
+        const bool tree = object == treeView || object == treeView->viewport();
+        switch (ke->key()) {
+            case Qt::Key_F2: {
+                const QModelIndex &index = treeView->currentIndex();
                 const QModelIndex &src = filterBookmarkModel->mapToSource(index);
-                if (ke->key() == Qt::Key_F2) {
-                    QStandardItem *item =
-                        bookmarkManager->treeBookmarkModel()->itemFromIndex(src);
-                    if (item) {
+                if (tree && searchField->text().isEmpty()) {
+                    if (QStandardItem *item = bookmarkManager->treeBookmarkModel()
+                        ->itemFromIndex(src)) {
                         item->setEditable(true);
                         treeView->edit(index);
                         item->setEditable(false);
                     }
-                } else if (ke->key() == Qt::Key_Delete) {
-                    bookmarkManager->removeBookmarkItem(treeView, src);
                 }
-            }
+            }   break;
+
+            case Qt::Key_Enter: {
+            case Qt::Key_Return:
+                if (tree) {
+                    const QString &data = treeView->selectionModel()->currentIndex()
+                        .data(Qt::UserRole + 10).toString();
+                    if (!data.isEmpty() && data != QLatin1String("Folder"))
+                        emit requestShowLink(data);
+                }
+            }   break;
 
-            switch (ke->key()) {
-                default: break;
-                case Qt::Key_Up: {
-                case Qt::Key_Down:
+            case Qt::Key_Delete: {
+                const QModelIndex &index = treeView->currentIndex();
+                const QModelIndex &src = filterBookmarkModel->mapToSource(index);
+                if (tree && searchField->text().isEmpty())
+                    bookmarkManager->removeBookmarkItem(treeView, src);
+            }   break;
+
+            case Qt::Key_Up: {
+            case Qt::Key_Down:
+                if (!tree)
                     treeView->subclassKeyPressEvent(ke);
-                }   break;
-
-                case Qt::Key_Enter: {
-                case Qt::Key_Return:
-                    index = treeView->selectionModel()->currentIndex();
-                    if (index.isValid()) {
-                        QString data = index.data(Qt::UserRole + 10).toString();
-                        if (!data.isEmpty() && data != QLatin1String("Folder"))
-                            emit requestShowLink(data);
-                    }
-                }   break;
+            }   break;
 
-                case Qt::Key_Escape: {
-                    emit escapePressed();
-                }   break;
-            }
-        } else if (e->type() == QEvent::MouseButtonRelease) {
-            if (index.isValid()) {
-                QMouseEvent *me = static_cast<QMouseEvent*>(e);
-                bool controlPressed = me->modifiers() & Qt::ControlModifier;
-                if(((me->button() == Qt::LeftButton) && controlPressed)
-                    || (me->button() == Qt::MidButton)) {
-                        QString data = index.data(Qt::UserRole + 10).toString();
-                        if (!data.isEmpty() && data != QLatin1String("Folder"))
-                            CentralWidget::instance()->setSourceInNewTab(data);
-                }
-            }
+            case Qt::Key_Escape: {
+                emit escapePressed();
+            }   break;
+
+            default: break;
         }
     }
+
+    if (e->type() == QEvent::MouseButtonRelease) {
+        QMouseEvent *me = static_cast<QMouseEvent*>(e);
+        bool controlPressed = me->modifiers() & Qt::ControlModifier;
+        if(((me->button() == Qt::LeftButton) && controlPressed)
+            || (me->button() == Qt::MidButton)) {
+                const QModelIndex &index = treeView->currentIndex();
+                const QString &data = index.data(Qt::UserRole + 10).toString();
+                if (!data.isEmpty() && data != QLatin1String("Folder"))
+                    CentralWidget::instance()->setSourceInNewTab(data);
+        }
+    }
+
     return QWidget::eventFilter(object, e);
 }
 
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index cd3feec106..0ddb1df6f4 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -247,6 +247,7 @@ Configure::Configure( int& argc, char** argv )
     dictionary[ "PHONON" ]          = "auto";
     dictionary[ "PHONON_BACKEND" ]  = "yes";
     dictionary[ "MULTIMEDIA" ]      = "yes";
+    dictionary[ "AUDIO_BACKEND" ]   = "yes";
     dictionary[ "DIRECTSHOW" ]      = "no";
     dictionary[ "WEBKIT" ]          = "auto";
     dictionary[ "DECLARATIVE" ]     = "auto";
@@ -897,6 +898,10 @@ void Configure::parseCmdLine()
             dictionary[ "MULTIMEDIA" ] = "no";
         } else if( configCmdLine.at(i) == "-multimedia" ) {
             dictionary[ "MULTIMEDIA" ] = "yes";
+        } else if( configCmdLine.at(i) == "-audio-backend" ) {
+            dictionary[ "AUDIO_BACKEND" ] = "yes";
+        } else if( configCmdLine.at(i) == "-no-audio-backend" ) {
+            dictionary[ "AUDIO_BACKEND" ] = "no";
         } else if( configCmdLine.at(i) == "-no-phonon" ) {
             dictionary[ "PHONON" ] = "no";
         } else if( configCmdLine.at(i) == "-phonon" ) {
@@ -1567,9 +1572,9 @@ bool Configure::displayHelp()
                     "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
                     "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
                     "[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
-                    "[-no-multimedia] [-multimedia] [-no-webkit] [-webkit]\n"
+                    "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
                     "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
-                    "[-graphicssystem raster|opengl|openvg]\n\n", 0, 7);
+                    "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7);
 
         desc("Installation options:\n\n");
 
@@ -1749,6 +1754,8 @@ bool Configure::displayHelp()
         desc("PHONON_BACKEND","yes","-phonon-backend",  "Compile in the platform-specific Phonon backend-plugin");
         desc("MULTIMEDIA", "no", "-no-multimedia",      "Do not compile the multimedia module");
         desc("MULTIMEDIA", "yes","-multimedia",         "Compile in multimedia module");
+        desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia");
+        desc("AUDIO_BACKEND", "yes","-audio-backend",   "Compile in the platform audio backend into QtMultimedia");
         desc("WEBKIT", "no",    "-no-webkit",           "Do not compile in the WebKit module");
         desc("WEBKIT", "yes",   "-webkit",              "Compile in the WebKit module (WebKit is built if a decent C++ compiler is used.)");
         desc("SCRIPT", "no",    "-no-script",           "Do not build the QtScript module.");
diff --git a/tools/designer/src/components/formeditor/itemview_propertysheet.cpp b/tools/designer/src/components/formeditor/itemview_propertysheet.cpp
index 38f73e75f6..96d159a654 100644
--- a/tools/designer/src/components/formeditor/itemview_propertysheet.cpp
+++ b/tools/designer/src/components/formeditor/itemview_propertysheet.cpp
@@ -45,6 +45,7 @@
 
 #include <QtGui/QAbstractItemView>
 #include <QtGui/QHeaderView>
+#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
@@ -54,41 +55,27 @@ struct Property {
     Property() : m_sheet(0),m_id(-1) {}
     Property(QDesignerPropertySheetExtension *sheet, int id)
         : m_sheet(sheet), m_id(id) {}
-    bool operator==(const Property &p) { return m_sheet == p.m_sheet && m_id == p.m_id; }
-    uint qHash() {
-        return ((int)(m_sheet-(QDesignerPropertySheetExtension*)(0))) & m_id;
-    }
 
     QDesignerPropertySheetExtension *m_sheet;
     int m_id;
 };
 
-class ItemViewPropertySheetPrivate {
+typedef QMap<int, Property> FakePropertyMap;
 
-public:
-    ItemViewPropertySheetPrivate(QHeaderView *horizontalHeader,
-                                 QHeaderView *verticalHeader,
-                                 QObject *parent);
+struct ItemViewPropertySheetPrivate {
+    ItemViewPropertySheetPrivate(QDesignerFormEditorInterface *core,
+                                 QHeaderView *horizontalHeader,
+                                 QHeaderView *verticalHeader);
 
-    inline void createMapping(int fakeId, QHeaderView *header, const QString &headerName);
     inline QStringList realPropertyNames();
     inline QString fakePropertyName(const QString &prefix, const QString &realName);
 
-    QDesignerFormEditorInterface *m_core;
-
-    // Maps index of fake property
-    // to index of real property in respective sheet
-    QHash<int, Property> m_propertyIdMap;
+    // Maps index of fake property to index of real property in respective sheet
+    FakePropertyMap m_propertyIdMap;
 
-    // Maps name of fake property
-    // to name of real property
+    // Maps name of fake property to name of real property
     QHash<QString, QString> m_propertyNameMap;
 
-private:
-    static QDesignerFormEditorInterface *formEditorForObject(QObject *o);
-
-    QHeaderView *m_hHeader;
-    QHeaderView *m_vHeader;
     QHash<QHeaderView *, QDesignerPropertySheetExtension *> m_propertySheet;
     QStringList m_realPropertyNames;
 };
@@ -111,43 +98,18 @@ using namespace qdesigner_internal;
 
 /***************** ItemViewPropertySheetPrivate *********************/
 
-ItemViewPropertySheetPrivate::ItemViewPropertySheetPrivate(QHeaderView *horizontalHeader,
-                                                           QHeaderView *verticalHeader,
-                                                           QObject *parent)
-        : m_core(formEditorForObject(parent)),
-          m_hHeader(horizontalHeader),
-          m_vHeader(verticalHeader)
+ItemViewPropertySheetPrivate::ItemViewPropertySheetPrivate(QDesignerFormEditorInterface *core,
+                                                           QHeaderView *horizontalHeader,
+                                                           QHeaderView *verticalHeader)
 {
     if (horizontalHeader)
         m_propertySheet.insert(horizontalHeader,
                                qt_extension<QDesignerPropertySheetExtension*>
-                               (m_core->extensionManager(), horizontalHeader));
+                               (core->extensionManager(), horizontalHeader));
     if (verticalHeader)
         m_propertySheet.insert(verticalHeader,
                                qt_extension<QDesignerPropertySheetExtension*>
-                               (m_core->extensionManager(), verticalHeader));
-}
-
-// Find the form editor in the hierarchy.
-// We know that the parent of the sheet is the extension manager
-// whose parent is the core.
-QDesignerFormEditorInterface *ItemViewPropertySheetPrivate::formEditorForObject(QObject *o)
-{
-    do {
-        if (QDesignerFormEditorInterface* core = qobject_cast<QDesignerFormEditorInterface*>(o))
-            return core;
-        o = o->parent();
-    } while(o);
-    Q_ASSERT(o);
-    return 0;
-}
-
-void ItemViewPropertySheetPrivate::createMapping(int fakeId, QHeaderView *header,
-                                                 const QString &headerName)
-{
-    const int realPropertyId = m_propertySheet.value(header)->indexOf(headerName);
-    QDesignerPropertySheetExtension *propertySheet = m_propertySheet.value(header);
-    m_propertyIdMap.insert(fakeId, Property(propertySheet, realPropertyId));
+                               (core->extensionManager(), verticalHeader));
 }
 
 QStringList ItemViewPropertySheetPrivate::realPropertyNames()
@@ -194,46 +156,19 @@ QString ItemViewPropertySheetPrivate::fakePropertyName(const QString &prefix,
 
 ItemViewPropertySheet::ItemViewPropertySheet(QTreeView *treeViewObject, QObject *parent)
         : QDesignerPropertySheet(treeViewObject, parent),
-        d(new ItemViewPropertySheetPrivate(treeViewObject->header(), 0, parent))
+        d(new ItemViewPropertySheetPrivate(core(), treeViewObject->header(), 0))
 {
-    QHeaderView *hHeader = treeViewObject->header();
-
-    foreach (const QString &realPropertyName, d->realPropertyNames()) {
-        const QString fakePropertyName
-                = d->fakePropertyName(QLatin1String("header"), realPropertyName);
-        d->createMapping(createFakeProperty(fakePropertyName, 0), hHeader, realPropertyName);
-    }
-
-    foreach (int id, d->m_propertyIdMap.keys()) {
-        setAttribute(id, true);
-        setPropertyGroup(id, QLatin1String(headerGroup));
-    }
+    initHeaderProperties(treeViewObject->header(), QLatin1String("header"));
 }
 
-
 ItemViewPropertySheet::ItemViewPropertySheet(QTableView *tableViewObject, QObject *parent)
         : QDesignerPropertySheet(tableViewObject, parent),
-        d(new ItemViewPropertySheetPrivate(tableViewObject->horizontalHeader(),
-                                           tableViewObject->verticalHeader(), parent))
+        d(new ItemViewPropertySheetPrivate(core(),
+                                           tableViewObject->horizontalHeader(),
+                                           tableViewObject->verticalHeader()))
 {
-    QHeaderView *hHeader = tableViewObject->horizontalHeader();
-    QHeaderView *vHeader = tableViewObject->verticalHeader();
-
-    foreach (const QString &realPropertyName, d->realPropertyNames()) {
-        const QString fakePropertyName
-                = d->fakePropertyName(QLatin1String("horizontalHeader"), realPropertyName);
-        d->createMapping(createFakeProperty(fakePropertyName, 0), hHeader, realPropertyName);
-    }
-    foreach (const QString &realPropertyName, d->realPropertyNames()) {
-        const QString fakePropertyName
-                = d->fakePropertyName(QLatin1String("verticalHeader"), realPropertyName);
-        d->createMapping(createFakeProperty(fakePropertyName, 0), vHeader, realPropertyName);
-    }
-
-    foreach (int id, d->m_propertyIdMap.keys()) {
-        setAttribute(id, true);
-        setPropertyGroup(id, QLatin1String(headerGroup));
-    }
+    initHeaderProperties(tableViewObject->horizontalHeader(), QLatin1String("horizontalHeader"));
+    initHeaderProperties(tableViewObject->verticalHeader(), QLatin1String("verticalHeader"));
 }
 
 ItemViewPropertySheet::~ItemViewPropertySheet()
@@ -241,6 +176,24 @@ ItemViewPropertySheet::~ItemViewPropertySheet()
     delete d;
 }
 
+void ItemViewPropertySheet::initHeaderProperties(QHeaderView *hv, const QString &prefix)
+{
+    QDesignerPropertySheetExtension *headerSheet = d->m_propertySheet.value(hv);
+    Q_ASSERT(headerSheet);
+    const QString headerGroupS = QLatin1String(headerGroup);
+    foreach (const QString &realPropertyName, d->realPropertyNames()) {
+        const int headerIndex = headerSheet->indexOf(realPropertyName);
+        Q_ASSERT(headerIndex != -1);
+        const QVariant defaultValue = realPropertyName == QLatin1String(visibleProperty) ?
+                                      QVariant(true) : headerSheet->property(headerIndex);
+        const QString fakePropertyName = d->fakePropertyName(prefix, realPropertyName);
+        const int fakeIndex = createFakeProperty(fakePropertyName, defaultValue);
+        d->m_propertyIdMap.insert(fakeIndex, Property(headerSheet, headerIndex));
+        setAttribute(fakeIndex, true);
+        setPropertyGroup(fakeIndex, headerGroupS);
+    }
+}
+
 /*!
   Returns the mapping of fake property names to real property names
   */
@@ -251,19 +204,17 @@ QHash<QString,QString> ItemViewPropertySheet::propertyNameMap() const
 
 QVariant ItemViewPropertySheet::property(int index) const
 {
-    if (d->m_propertyIdMap.contains(index)) {
-        Property realProperty = d->m_propertyIdMap.value(index);
-        return realProperty.m_sheet->property(realProperty.m_id);
-    } else {
-        return QDesignerPropertySheet::property(index);
-    }
+    const FakePropertyMap::const_iterator it = d->m_propertyIdMap.constFind(index);
+    if (it != d->m_propertyIdMap.constEnd())
+        return it.value().m_sheet->property(it.value().m_id);
+    return QDesignerPropertySheet::property(index);
 }
 
 void ItemViewPropertySheet::setProperty(int index, const QVariant &value)
 {
-    if (d->m_propertyIdMap.contains(index)) {
-        Property realProperty = d->m_propertyIdMap.value(index);
-        realProperty.m_sheet->setProperty(realProperty.m_id, value);
+    const FakePropertyMap::iterator it = d->m_propertyIdMap.find(index);
+    if (it != d->m_propertyIdMap.end()) {
+        it.value().m_sheet->setProperty(it.value().m_id, value);
     } else {
         QDesignerPropertySheet::setProperty(index, value);
     }
@@ -271,18 +222,46 @@ void ItemViewPropertySheet::setProperty(int index, const QVariant &value)
 
 void ItemViewPropertySheet::setChanged(int index, bool changed)
 {
-    if (d->m_propertyIdMap.contains(index)) {
-        Property realProperty = d->m_propertyIdMap.value(index);
-        realProperty.m_sheet->setChanged(realProperty.m_id, changed);
+    const FakePropertyMap::iterator it = d->m_propertyIdMap.find(index);
+    if (it != d->m_propertyIdMap.end()) {
+        it.value().m_sheet->setChanged(it.value().m_id, changed);
+    } else {
+        QDesignerPropertySheet::setChanged(index, changed);
     }
-    QDesignerPropertySheet::setChanged(index, changed);
+}
+
+bool ItemViewPropertySheet::isChanged(int index) const
+{
+    const FakePropertyMap::const_iterator it = d->m_propertyIdMap.constFind(index);
+    if (it != d->m_propertyIdMap.constEnd())
+        return it.value().m_sheet->isChanged(it.value().m_id);
+    return QDesignerPropertySheet::isChanged(index);
+}
+
+bool ItemViewPropertySheet::hasReset(int index) const
+{
+    const FakePropertyMap::const_iterator it = d->m_propertyIdMap.constFind(index);
+    if (it != d->m_propertyIdMap.constEnd())
+        return it.value().m_sheet->hasReset(it.value().m_id);
+    return QDesignerPropertySheet::hasReset(index);
 }
 
 bool ItemViewPropertySheet::reset(int index)
 {
-    if (d->m_propertyIdMap.contains(index)) {
-        Property realProperty = d->m_propertyIdMap.value(index);
-        return realProperty.m_sheet->reset(realProperty.m_id);
+    const FakePropertyMap::iterator it = d->m_propertyIdMap.find(index);
+    if (it != d->m_propertyIdMap.end()) {
+       QDesignerPropertySheetExtension *headerSheet = it.value().m_sheet;
+       const int headerIndex = it.value().m_id;
+       const bool resetRC = headerSheet->reset(headerIndex);
+       // Resetting for "visible" might fail and the stored default
+       // of the Widget database is "false" due to the widget not being
+       // visible at the time it was determined. Reset to "true" manually.
+       if (!resetRC && headerSheet->propertyName(headerIndex) == QLatin1String(visibleProperty)) {
+           headerSheet->setProperty(headerIndex, QVariant(true));
+           headerSheet->setChanged(headerIndex, false);
+           return true;
+       }
+       return resetRC;
     } else {
         return QDesignerPropertySheet::reset(index);
     }
diff --git a/tools/designer/src/components/formeditor/itemview_propertysheet.h b/tools/designer/src/components/formeditor/itemview_propertysheet.h
index a926339510..dbcd63db16 100644
--- a/tools/designer/src/components/formeditor/itemview_propertysheet.h
+++ b/tools/designer/src/components/formeditor/itemview_propertysheet.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
 
-class ItemViewPropertySheetPrivate;
+struct ItemViewPropertySheetPrivate;
 
 class ItemViewPropertySheet: public QDesignerPropertySheet
 {
@@ -69,11 +69,15 @@ public:
     QVariant property(int index) const;
     void setProperty(int index, const QVariant &value);
 
-    void setChanged(int index, bool changed);
+    virtual void setChanged(int index, bool changed);
+    virtual bool isChanged(int index) const;
 
-    bool reset(int index);
+    virtual bool hasReset(int index) const;
+    virtual bool reset(int index);
 
 private:
+    void initHeaderProperties(QHeaderView *hv, const QString &prefix);
+
     ItemViewPropertySheetPrivate *d;
 };
 
diff --git a/tools/designer/src/lib/shared/actionrepository.cpp b/tools/designer/src/lib/shared/actionrepository.cpp
index 1655d07e26..83e64e64da 100644
--- a/tools/designer/src/lib/shared/actionrepository.cpp
+++ b/tools/designer/src/lib/shared/actionrepository.cpp
@@ -226,7 +226,7 @@ void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action,
     item->setText(action->text());
     item->setToolTip(action->text());
     // shortcut
-    const QString shortcut = actionShortCut(core, action).value().toString();
+    const QString shortcut = actionShortCut(core, action).value().toString(QKeySequence::NativeText);
     item = sl[ShortCutColumn];
     item->setText(shortcut);
     item->setToolTip(shortcut);
diff --git a/tools/linguist/linguist/messageeditor.h b/tools/linguist/linguist/messageeditor.h
index b69af9c5c8..d73c21678f 100644
--- a/tools/linguist/linguist/messageeditor.h
+++ b/tools/linguist/linguist/messageeditor.h
@@ -67,7 +67,7 @@ struct MessageEditorData {
     QList<FormMultiWidget *> transTexts;
     QString invariantForm;
     QString firstForm;
-    float fontSize;
+    qreal fontSize;
     bool pluralEditMode;
 };
 
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index c45459a0e7..b8e8eb2a24 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -55,6 +55,8 @@
 #include <QtCore/QStringList>
 #include <QtCore/QTextStream>
 
+QT_USE_NAMESPACE
+
 #ifdef QT_BOOTSTRAPPED
 static void initBinaryDir(
 #ifndef Q_OS_WIN
diff --git a/translations/assistant_pl.ts b/translations/assistant_pl.ts
index 069b5a069d..0ef3251f13 100644
--- a/translations/assistant_pl.ts
+++ b/translations/assistant_pl.ts
@@ -78,7 +78,7 @@
 <context>
     <name>BookmarkManager</name>
     <message>
-        <location line="+434"/>
+        <location line="+435"/>
         <source>Bookmarks</source>
         <translation>Zakładki</translation>
     </message>
@@ -102,7 +102,7 @@
 <context>
     <name>BookmarkWidget</name>
     <message>
-        <location line="-416"/>
+        <location line="-417"/>
         <source>Filter:</source>
         <translation>Filtr:</translation>
     </message>
@@ -150,7 +150,7 @@
 <context>
     <name>CentralWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+238"/>
+        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+239"/>
         <source>Add new page</source>
         <translation>Dodaj nową stronę</translation>
     </message>
@@ -165,7 +165,7 @@
         <translation>Wydrukuj dokument</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+130"/>
         <location line="+2"/>
         <source>unknown</source>
         <translation>nieznany</translation>
@@ -191,7 +191,7 @@
         <translation>Dodaj zakładkę dla tej strony...</translation>
     </message>
     <message>
-        <location line="+255"/>
+        <location line="+235"/>
         <source>Search</source>
         <translation>Wyszukaj</translation>
     </message>
@@ -225,7 +225,7 @@
 <context>
     <name>FindWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="-955"/>
+        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="-918"/>
         <source>Previous</source>
         <translation>Poprzedni</translation>
     </message>
@@ -281,7 +281,7 @@
 <context>
     <name>HelpViewer</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+492"/>
+        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+489"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
@@ -326,7 +326,7 @@
         <translation>Wy&amp;szukaj:</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+72"/>
         <source>Open Link</source>
         <translation>Otwórz odsyłacz</translation>
     </message>
@@ -440,19 +440,19 @@
     <name>MainWindow</name>
     <message>
         <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+110"/>
-        <location line="+391"/>
+        <location line="+383"/>
         <source>Index</source>
         <translation>Indeks</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+383"/>
+        <location line="-377"/>
+        <location line="+375"/>
         <source>Contents</source>
         <translation>Spis treści</translation>
     </message>
     <message>
-        <location line="-378"/>
-        <location line="+382"/>
+        <location line="-370"/>
+        <location line="+374"/>
         <source>Bookmarks</source>
         <translation>Zakładki</translation>
     </message>
@@ -462,14 +462,14 @@
         <translation>Wyszukaj</translation>
     </message>
     <message>
-        <location line="-372"/>
-        <location line="+215"/>
-        <location line="+512"/>
+        <location line="-364"/>
+        <location line="+207"/>
+        <location line="+514"/>
         <source>Qt Assistant</source>
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <location line="-544"/>
+        <location line="-546"/>
         <location line="+5"/>
         <source>Unfiltered</source>
         <translation>Nieprzefiltrowany</translation>
@@ -515,7 +515,12 @@
         <translation>Znajdź w &amp;tekście...</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+2"/>
+        <source>&amp;Find</source>
+        <translation>&amp;Znajdź</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Find &amp;Next</source>
         <translation>Znajdź &amp;następny</translation>
     </message>
@@ -585,7 +590,12 @@
         <translation>Znajdź bieżącą stronę w spisie treści</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+2"/>
+        <source>Sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Next Page</source>
         <translation>Następna strona</translation>
     </message>
@@ -635,7 +645,7 @@
         <translation>Przefiltrowane przez:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+25"/>
         <source>Address Toolbar</source>
         <translation>Pasek adresu</translation>
     </message>
@@ -660,7 +670,7 @@
         <translation>Uaktualnianie indeksu wyszukiwawczego</translation>
     </message>
     <message>
-        <location line="-638"/>
+        <location line="-640"/>
         <source>Looking for Qt Documentation...</source>
         <translation>Szukanie dokumentacji Qt...</translation>
     </message>
@@ -962,7 +972,7 @@
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="+217"/>
+        <location filename="../tools/assistant/tools/assistant/main.cpp" line="+228"/>
         <source>Could not register documentation file
 %1
 
@@ -1024,7 +1034,7 @@ Powód:
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+195"/>
+        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+196"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiuj</translation>
     </message>
diff --git a/translations/designer_pl.ts b/translations/designer_pl.ts
index f9c6dd0894..acd18270d9 100644
--- a/translations/designer_pl.ts
+++ b/translations/designer_pl.ts
@@ -517,12 +517,12 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+907"/>
+        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+915"/>
         <source>Move action</source>
         <translation>Przenieś akcję</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-424"/>
+        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-432"/>
         <source>Change Title</source>
         <translation>Zmień tytuł</translation>
     </message>
@@ -703,7 +703,7 @@
 <context>
     <name>ConnectionDelegate</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="+643"/>
+        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="+644"/>
         <source>&lt;object&gt;</source>
         <translation>&lt;obiekt&gt;</translation>
     </message>
@@ -1028,7 +1028,7 @@
 <context>
     <name>FormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+359"/>
+        <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+375"/>
         <source>Invalid stretch value for &apos;%1&apos;: &apos;%2&apos;</source>
         <extracomment>Parsing layout stretch values</extracomment>
         <translation>Niepoprawna wartość rozciągniecia dla &apos;%1&apos;: &apos;%2&apos;</translation>
@@ -1050,7 +1050,7 @@
     <message>
         <location line="+4"/>
         <source>Preview Zoom</source>
-        <translation>Powiększenie podglądu</translation>
+        <translation>Powiększanie podglądu</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1259,7 +1259,7 @@
     <message>
         <location line="-34"/>
         <source>Show this Dialog on Startup</source>
-        <translation>Pokaż to okno przy uruchamianiu</translation>
+        <translation>Pokazuj to okno przy uruchamianiu</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1413,7 +1413,7 @@
         <translation>Niepoprawny plik UI: brak głównego elementu &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+104"/>
         <source>The creation of a widget of the class &apos;%1&apos; failed.</source>
         <translation>Utworzenie widżetu klasy &apos;%1&apos; nie powiodło się.</translation>
     </message>
@@ -1594,7 +1594,7 @@ Skrypt: %3</translation>
     <message>
         <location line="-10"/>
         <source>Edit Widgets</source>
-        <translation>Edytuj widżety</translation>
+        <translation>Modyfikuj widżety</translation>
     </message>
     <message>
         <location line="+195"/>
@@ -1803,7 +1803,7 @@ Czy chcesz zaktualizować położenie pliku lub wygenerować nowy formularz?</tr
     <message>
         <location line="+1"/>
         <source>&amp;Print...</source>
-        <translation>Wy&amp;drukuj...</translation>
+        <translation>&amp;Drukuj...</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2277,7 +2277,7 @@ Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w
 <context>
     <name>QFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+163"/>
+        <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+168"/>
         <source>An empty class name was passed on to %1 (object name: &apos;%2&apos;).</source>
         <extracomment>Empty class name passed to widget factory method</extracomment>
         <translation>Pusta nazwa klasy została przekazana do %1 (nazwa obiektu: &apos;%2&apos;).</translation>
@@ -2669,7 +2669,7 @@ Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w
     <message>
         <location filename="../tools/shared/qtgradienteditor/qtgradientdialog.ui"/>
         <source>Edit Gradient</source>
-        <translation>Edytuj gradient</translation>
+        <translation>Modyfikuj gradient</translation>
     </message>
 </context>
 <context>
@@ -3042,7 +3042,7 @@ Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w
         <location/>
         <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Edit...</source>
-        <translation>Edytuj...</translation>
+        <translation>Modyfikuj...</translation>
     </message>
     <message>
         <location/>
@@ -3499,7 +3499,7 @@ jako:
     <message>
         <location line="+20"/>
         <source>Edit Resources...</source>
-        <translation>Edytuj zasoby...</translation>
+        <translation>Modyfikuj zasoby...</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3961,12 +3961,12 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location line="+98"/>
         <source>Edit action</source>
-        <translation>Edytuj akcję</translation>
+        <translation>Modyfikuj akcję</translation>
     </message>
     <message>
         <location line="-417"/>
         <source>Edit...</source>
-        <translation>Edytuj...</translation>
+        <translation>Modyfikuj...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4126,7 +4126,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp" line="+73"/>
         <source>Edit Buddies</source>
-        <translation>Edytuj skojarzone etykiety</translation>
+        <translation>Modyfikuj skojarzone etykiety</translation>
     </message>
 </context>
 <context>
@@ -4134,7 +4134,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp" line="+56"/>
         <source>Edit Buddies</source>
-        <translation>Edytuj skojarzone etykiety</translation>
+        <translation>Modyfikuj skojarzone etykiety</translation>
     </message>
 </context>
 <context>
@@ -4254,7 +4254,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location filename="../tools/designer/src/components/taskmenu/combobox_taskmenu.cpp" line="+68"/>
         <source>Edit Items...</source>
-        <translation>Edytuj elementy...</translation>
+        <translation>Modyfikuj elementy...</translation>
     </message>
     <message>
         <location line="+38"/>
@@ -4653,7 +4653,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location line="+6"/>
         <source>Edit the selected profile</source>
-        <translation>Edytuj zaznaczony profil</translation>
+        <translation>Modyfikuj zaznaczony profil</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -4673,7 +4673,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location line="+35"/>
         <source>Edit Profile</source>
-        <translation>Edytuj profil</translation>
+        <translation>Modyfikuj profil</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -4709,7 +4709,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location line="+1"/>
         <source>The file &quot;%1&quot; has changed outside Designer. Do you want to reload it?</source>
-        <translation type="unfinished">Plik &quot;%1&quot; zmienił się na zewnątrz Designera. Czy chcesz go ponownie załadować?</translation>
+        <translation>Plik &quot;%1&quot; zmienił się na zewnątrz Designera. Czy chcesz go ponownie załadować?</translation>
     </message>
 </context>
 <context>
@@ -4725,7 +4725,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="-1267"/>
         <source>Edit contents</source>
-        <translation>Edytuj zawartość</translation>
+        <translation>Modyfikuj zawartość</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4834,7 +4834,7 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FormWindowManager</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+364"/>
+        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+365"/>
         <source>Cu&amp;t</source>
         <translation>Wy&amp;tnij</translation>
     </message>
@@ -5290,12 +5290,12 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location line="+32"/>
         <source>Edit List Widget</source>
-        <translation>Edytuj listę</translation>
+        <translation>Modyfikuj listę</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Edit Combobox</source>
-        <translation>Edytuj combobox</translation>
+        <translation>Modyfikuj combobox</translation>
     </message>
 </context>
 <context>
@@ -5303,7 +5303,7 @@ Czy chcesz nadpisać szablon?</translation>
     <message>
         <location filename="../tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp" line="+67"/>
         <source>Edit Items...</source>
-        <translation>Edytuj elementy...</translation>
+        <translation>Modyfikuj elementy...</translation>
     </message>
     <message>
         <location line="+38"/>
@@ -5560,18 +5560,15 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::ObjectInspector</name>
     <message>
-        <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="+754"/>
-        <source>&amp;Find in Text...</source>
-        <translation>Z&amp;najdź w tekście...</translation>
-    </message>
-</context>
-<context>
-    <name>qdesigner_internal::ObjectInspector::ObjectInspectorPrivate</name>
-    <message>
-        <location line="-438"/>
+        <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="+316"/>
         <source>Change Current Page</source>
         <translation>Zmień bieżącą stronę</translation>
     </message>
+    <message>
+        <location line="+438"/>
+        <source>&amp;Find in Text...</source>
+        <translation>Z&amp;najdź w tekście...</translation>
+    </message>
 </context>
 <context>
     <name>qdesigner_internal::OrderDialog</name>
@@ -5611,7 +5608,7 @@ Wybierz inną nazwę.</translation>
     <message>
         <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui"/>
         <source>Edit Palette</source>
-        <translation>Edytuj paletę</translation>
+        <translation>Modyfikuj paletę</translation>
     </message>
     <message>
         <location/>
@@ -5719,7 +5716,7 @@ Wybierz inną nazwę.</translation>
     <message>
         <location filename="../tools/designer/src/lib/shared/plaintexteditor.cpp" line="+65"/>
         <source>Edit text</source>
-        <translation>Edytuj tekst</translation>
+        <translation>Modyfikuj tekst</translation>
     </message>
 </context>
 <context>
@@ -5785,9 +5782,6 @@ Wybierz inną nazwę.</translation>
         <source>Browse...</source>
         <translation>Przeglądaj...</translation>
     </message>
-</context>
-<context>
-    <name>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate</name>
     <message>
         <location line="+118"/>
         <source>Load Custom Device Skin</source>
@@ -6202,12 +6196,12 @@ Klasa: %2</translation>
     <message>
         <location line="+235"/>
         <source>Edit ToolTip</source>
-        <translation>Edytuj podpowiedź</translation>
+        <translation>Modyfikuj podpowiedź</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Edit WhatsThis</source>
-        <translation>Edytuj &quot;Co to jest&quot;</translation>
+        <translation>Modyfikuj &quot;Co to jest&quot;</translation>
     </message>
 </context>
 <context>
@@ -6332,7 +6326,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+436"/>
         <source>Edit text</source>
-        <translation>Edytuj tekst</translation>
+        <translation>Modyfikuj tekst</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -6433,7 +6427,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/lib/shared/scriptdialog.cpp" line="+66"/>
         <source>Edit script</source>
-        <translation>Edytuj skrypt</translation>
+        <translation>Modyfikuj skrypt</translation>
     </message>
     <message>
         <location line="+56"/>
@@ -6483,7 +6477,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp" line="+72"/>
         <source>Edit Signals/Slots</source>
-        <translation>Edytuj sygnały/sloty</translation>
+        <translation>Modyfikuj sygnały/sloty</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6496,7 +6490,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp" line="+58"/>
         <source>Edit Signals/Slots</source>
-        <translation>Edytuj sygnały/sloty</translation>
+        <translation>Modyfikuj sygnały/sloty</translation>
     </message>
 </context>
 <context>
@@ -6520,7 +6514,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="+97"/>
         <source>Edit Style Sheet</source>
-        <translation>Edytuj arkusz stylu</translation>
+        <translation>Modyfikuj arkusz stylu</translation>
     </message>
     <message>
         <location line="-7"/>
@@ -6587,7 +6581,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp" line="+73"/>
         <source>Edit Tab Order</source>
-        <translation>Edytuj kolejność tabulacji</translation>
+        <translation>Modyfikuj kolejność tabulacji</translation>
     </message>
 </context>
 <context>
@@ -6595,7 +6589,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp" line="+57"/>
         <source>Edit Tab Order</source>
-        <translation>Edytuj kolejność tabulacji</translation>
+        <translation>Modyfikuj kolejność tabulacji</translation>
     </message>
 </context>
 <context>
@@ -6603,7 +6597,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui"/>
         <source>Edit Table Widget</source>
-        <translation>Edytuj tablę</translation>
+        <translation>Modyfikuj tablę</translation>
     </message>
     <message>
         <location/>
@@ -6652,7 +6646,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp" line="+64"/>
         <source>Edit Items...</source>
-        <translation>Edytuj elementy...</translation>
+        <translation>Modyfikuj elementy...</translation>
     </message>
 </context>
 <context>
@@ -6688,12 +6682,12 @@ Klasa: %2</translation>
     <message>
         <location line="-1"/>
         <source>Edit HTML</source>
-        <translation>Edytuj HTML</translation>
+        <translation>Modyfikuj HTML</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Edit Text</source>
-        <translation>Edytuj tekst</translation>
+        <translation>Modyfikuj tekst</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6757,7 +6751,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui"/>
         <source>Edit Tree Widget</source>
-        <translation>Edytuj drzewo</translation>
+        <translation>Modyfikuj drzewo</translation>
     </message>
     <message>
         <location/>
@@ -6883,7 +6877,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp" line="+63"/>
         <source>Edit Items...</source>
-        <translation>Edytuj elementy...</translation>
+        <translation>Modyfikujj elementy...</translation>
     </message>
 </context>
 <context>
@@ -6934,7 +6928,7 @@ Klasa: %2</translation>
     <message>
         <location line="+2"/>
         <source>Edit name</source>
-        <translation>Edytuj nazwę</translation>
+        <translation>Modyfikuj nazwę</translation>
     </message>
 </context>
 <context>
@@ -6950,7 +6944,7 @@ Klasa: %2</translation>
     <message>
         <location filename="../tools/designer/src/components/formeditor/tool_widgeteditor.cpp" line="+67"/>
         <source>Edit Widgets</source>
-        <translation>Edytuj widżety</translation>
+        <translation>Modyfikuj widżety</translation>
     </message>
 </context>
 <context>
diff --git a/translations/linguist_pl.ts b/translations/linguist_pl.ts
index cdff54b5e1..963c39b171 100644
--- a/translations/linguist_pl.ts
+++ b/translations/linguist_pl.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1357"/>
+        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1364"/>
         <source>Qt Linguist</source>
         <translation>Qt Linguist</translation>
     </message>
@@ -110,11 +110,17 @@
     </message>
     <message>
         <location line="+4"/>
+        <location line="+8"/>
         <source>&lt;p&gt;[more duplicates omitted]</source>
         <translation>&lt;p&gt;[pominięto resztę powtórzeń]</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-5"/>
+        <source>&lt;p&gt;* ID: %1</source>
+        <translation>&lt;p&gt;* identyfikator: %1</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;* Context: %1&lt;br&gt;* Source: %2</source>
         <translation>&lt;p&gt;* Kontekst: %1&lt;br&gt;* Źródło: %2</translation>
     </message>
@@ -124,7 +130,7 @@
         <translation>&lt;br&gt;* Komentarz: %3</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+71"/>
         <source>Linguist does not know the plural rules for &apos;%1&apos;.
 Will assume a single universal form.</source>
         <translation>Linguist nie zna reguł liczby mnogiej dla &quot;%1&quot;.
@@ -312,7 +318,7 @@ Przyjmie on uniwersalną formę liczby pojedynczej.</translation>
 <context>
     <name>LRelease</name>
     <message numerus="yes">
-        <location filename="../tools/linguist/shared/qm.cpp" line="+748"/>
+        <location filename="../tools/linguist/shared/qm.cpp" line="+763"/>
         <source>Dropped %n message(s) which had no ID.</source>
         <translation>
             <numerusform>Opuszczono %n wyrażenie które nie miało identyfikatora.</numerusform>
@@ -714,7 +720,7 @@ Przyjmie on uniwersalną formę liczby pojedynczej.</translation>
         <translation>Zamienia tłumaczenia we wszystkich pasujących do wzorca wpisach.</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-2004"/>
+        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-2011"/>
         <source></source>
         <comment>This is the application&apos;s main window.</comment>
         <translation></translation>
@@ -732,27 +738,27 @@ Przyjmie on uniwersalną formę liczby pojedynczej.</translation>
     </message>
     <message>
         <location line="-2"/>
-        <location line="+62"/>
+        <location line="+63"/>
         <source>Context</source>
         <translation>Kontekst</translation>
     </message>
     <message>
-        <location line="-61"/>
+        <location line="-62"/>
         <source>Items</source>
         <translation>Elementy</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+79"/>
         <source>This panel lists the source contexts.</source>
         <translation>Ten panel pokazuje listę kontekstów.</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
         <source>Strings</source>
         <translation>Tłumaczenia</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Phrases and guesses</source>
         <translation>Wyrażenia i podpowiedzi</translation>
     </message>
@@ -773,7 +779,7 @@ Przyjmie on uniwersalną formę liczby pojedynczej.</translation>
         <translation> MOD </translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+139"/>
         <source>Loading...</source>
         <translation>Ładowanie...</translation>
     </message>
@@ -811,7 +817,7 @@ Czy chcesz pominąć pierwszy plik?</translation>
         </translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>Related files (%1);;</source>
         <translation>Związane pliki (%1);;</translation>
     </message>
@@ -1176,7 +1182,7 @@ Wszystkie pliki (*)</translation>
         <translation>Czy chcesz zachować książke wyrażeń &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location line="+323"/>
+        <location line="+334"/>
         <source>All</source>
         <translation>Wszystko</translation>
     </message>
@@ -1242,7 +1248,7 @@ Wszystkie pliki (*)</translation>
     </message>
     <message>
         <location/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-470"/>
+        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-481"/>
         <source>Translation</source>
         <translation>Tłumaczenie</translation>
     </message>
@@ -1579,7 +1585,7 @@ Wszystkie pliki (*)</translation>
         <translation>Tutaj można wprowadzić komentarze na własny użytek. One nie mają wpływu na przetłumaczoną aplikację.</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="+234"/>
         <source>%1 translation (%2)</source>
         <translation>Tłumaczenie na język %1 (%2)</translation>
     </message>
@@ -1609,7 +1615,7 @@ Linia: %2</translation>
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+832"/>
+        <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+825"/>
         <source>Completion status for %1</source>
         <translation>Stan ukończenia dla %1</translation>
     </message>
@@ -1632,7 +1638,7 @@ Linia: %2</translation>
 <context>
     <name>MsgEdit</name>
     <message>
-        <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-612"/>
+        <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-614"/>
         <source></source>
         <comment>This is the right panel of the main window.</comment>
         <translation></translation>
@@ -1811,8 +1817,8 @@ Linia: %2</translation>
         <translation>Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1118"/>
-        <location line="+18"/>
+        <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1120"/>
+        <location line="+27"/>
         <location line="+67"/>
         <location line="+39"/>
         <location line="+17"/>
@@ -1847,7 +1853,7 @@ Linia: %2</translation>
         <translation>Pliki XLIFF</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/shared/qph.cpp" line="+183"/>
+        <location filename="../tools/linguist/shared/qph.cpp" line="+195"/>
         <source>Qt Linguist &apos;Phrase Book&apos;</source>
         <translation>Qt Linguist &quot;Książka wyrażeń&quot;</translation>
     </message>
@@ -1998,12 +2004,12 @@ Linia: %2</translation>
 <context>
     <name>TranslationSettingsDialog</name>
     <message>
-        <location filename="../tools/linguist/linguist/translationsettingsdialog.cpp" line="+68"/>
+        <location filename="../tools/linguist/linguist/translationsettingsdialog.cpp" line="+93"/>
         <source>Any Country</source>
         <translation>Dowolny kraj</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="-22"/>
         <location line="+8"/>
         <source>Settings for &apos;%1&apos; - Qt Linguist</source>
         <translation>Ustawienia dla &apos;%1&apos; - Qt Linguist</translation>
diff --git a/translations/qt_help_pl.ts b/translations/qt_help_pl.ts
index 220f70c601..f2eb6c94ec 100644
--- a/translations/qt_help_pl.ts
+++ b/translations/qt_help_pl.ts
@@ -32,13 +32,9 @@
 <context>
     <name>QHelpCollectionHandler</name>
     <message>
-        <source>The collection file is not set up yet!</source>
-        <translation type="obsolete">Plik z kolekcją nie jest jeszcze ustawiony!</translation>
-    </message>
-    <message>
         <location filename="../tools/assistant/lib/qhelpcollectionhandler.cpp" line="+79"/>
         <source>The collection file &apos;%1&apos; is not set up yet!</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik z kolekcją &quot;%1&quot; nie jest jeszcze ustawiony!</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -59,31 +55,27 @@
     <message>
         <location line="+16"/>
         <source>The collection file &apos;%1&apos; already exists!</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik z kolekcją &quot;%1&quot; już istnieje!</translation>
     </message>
     <message>
         <location line="+148"/>
         <source>Unknown filter &apos;%1&apos;!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieznany filtr &quot;%1&quot;!</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Invalid documentation file &apos;%1&apos;!</source>
-        <translation type="unfinished"></translation>
+        <translation>Niepoprawny plik z dokumentacją &quot;%1&quot;!</translation>
     </message>
     <message>
         <location line="+167"/>
         <source>Cannot register namespace &apos;%1&apos;!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można zarejestrować przestrzeni nazw &quot;%1&quot;!</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Cannot open database &apos;%1&apos; to optimize!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The specified collection file already exists!</source>
-        <translation type="obsolete">Podany plik z kolekcją już istnieje!</translation>
+        <translation>Nie można otworzyć bazy danych &quot;%1&quot; do zoptymalizowania!</translation>
     </message>
     <message>
         <location line="-438"/>
@@ -96,10 +88,6 @@
         <translation>Nie można skopiować pliku z kolekcją: %1</translation>
     </message>
     <message>
-        <source>Unknown filter!</source>
-        <translation type="obsolete">Nieznany filtr!</translation>
-    </message>
-    <message>
         <location line="+174"/>
         <source>Cannot register filter %1!</source>
         <translation>Nie można zarejestrować pliku %1!</translation>
@@ -110,10 +98,6 @@
         <translation>Nie można otworzyć pliku z dokumentacją %1!</translation>
     </message>
     <message>
-        <source>Invalid documentation file!</source>
-        <translation type="obsolete">Niepoprawny plik z dokumentacją!</translation>
-    </message>
-    <message>
         <location line="+40"/>
         <source>The namespace %1 was not registered!</source>
         <translation>Przestrzeń nazw %1 nie została zarejestrowana!</translation>
@@ -123,14 +107,6 @@
         <source>Namespace %1 already exists!</source>
         <translation>Przestrzeń nazw %1 już istnieje!</translation>
     </message>
-    <message>
-        <source>Cannot register namespace!</source>
-        <translation type="obsolete">Nie można zarejestrować przestrzeni nazw!</translation>
-    </message>
-    <message>
-        <source>Cannot open database to optimize!</source>
-        <translation type="obsolete">Nie można otworzyć bazy danych do zoptymalizowania!</translation>
-    </message>
 </context>
 <context>
     <name>QHelpDBReader</name>
@@ -144,7 +120,7 @@
 <context>
     <name>QHelpEngineCore</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+524"/>
+        <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+525"/>
         <source>The specified namespace does not exist!</source>
         <translation>Podana przestrzeń nazw nie istnieje!</translation>
     </message>
@@ -152,7 +128,7 @@
 <context>
     <name>QHelpEngineCorePrivate</name>
     <message>
-        <location line="-402"/>
+        <location line="-403"/>
         <source>Cannot open documentation file %1: %2!</source>
         <translation>Nie można otworzyć pliku z dokumentacją %1: %2!</translation>
     </message>
@@ -342,11 +318,6 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelp_global.h" line="+83"/>
-        <source>Untitled</source>
-        <translation>Nienazwany</translation>
-    </message>
-    <message>
         <location filename="../tools/assistant/lib/qhelpprojectdata.cpp" line="+85"/>
         <source>Unknown token.</source>
         <translation>Nieznany znak.</translation>
diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts
index f79ecb03d0..fabec70c93 100644
--- a/translations/qt_pl.ts
+++ b/translations/qt_pl.ts
@@ -4,7 +4,7 @@
 <context>
     <name>CloseButton</name>
     <message>
-        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2245"/>
+        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2264"/>
         <source>Close Tab</source>
         <translation>Zamknij kartę</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>FakeReply</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" line="+2193"/>
+        <location filename="../src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" line="+2199"/>
         <source>Fake error !</source>
         <translation type="unfinished"></translation>
     </message>
@@ -58,7 +58,7 @@
 <context>
     <name>Phonon::AudioOutput</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+377"/>
+        <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+385"/>
         <source>&lt;html&gt;The audio playback device &lt;b&gt;%1&lt;/b&gt; does not work.&lt;br/&gt;Falling back to &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</source>
         <translation>&lt;html&gt;Urządzenie dźwiękowe &lt;b&gt;%1&lt;/b&gt; nie działa.&lt;br/&gt;Przywracanie do &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</translation>
     </message>
@@ -76,7 +76,7 @@
 <context>
     <name>Phonon::Gstreamer::Backend</name>
     <message>
-        <location filename="../src/3rdparty/phonon/gstreamer/backend.cpp" line="+171"/>
+        <location filename="../src/3rdparty/phonon/gstreamer/backend.cpp" line="+182"/>
         <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.
           Some video features have been disabled.</source>
         <translation>Ostrzeżenie: Wygląda na to, że pakiet gstreamer0.10-plugins-good nie jest zainstalowany w tym systemie.
@@ -96,7 +96,7 @@ Obsługa dźwięku i wideo została wyłączona</translation>
         <location filename="../src/3rdparty/phonon/gstreamer/mediaobject.cpp" line="+90"/>
         <source>Cannot start playback. 
 
-Check your Gstreamer installation and make sure you 
+Check your GStreamer installation and make sure you 
 have libgstreamer-plugins-base installed.</source>
         <translation>Nie można rozpocząć odtwarzania.
 
@@ -109,10 +109,10 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
         <translation>Brak wymaganego kodeka. Aby odtworzyć zawartość musisz zainstalować poniższy kodek: %0</translation>
     </message>
     <message>
-        <location line="+681"/>
+        <location line="+702"/>
         <location line="+8"/>
         <location line="+15"/>
-        <location line="+22"/>
+        <location line="+26"/>
         <location line="+6"/>
         <location line="+19"/>
         <location line="+339"/>
@@ -121,12 +121,12 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
         <translation>Nie można otworzyć źródła mediów.</translation>
     </message>
     <message>
-        <location line="-420"/>
+        <location line="-424"/>
         <source>Invalid source type.</source>
         <translation>Niepoprawny typ źródła.</translation>
     </message>
     <message>
-        <location line="+394"/>
+        <location line="+398"/>
         <source>Could not locate media source.</source>
         <translation>Nie można znaleźć źródła mediów.</translation>
     </message>
@@ -144,7 +144,7 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audiooutput.cpp" line="+108"/>
+        <location filename="../src/3rdparty/phonon/mmf/audiooutput.cpp" line="+98"/>
         <source>Audio Output</source>
         <translation>Wyjście dźwięku</translation>
     </message>
@@ -166,12 +166,12 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
     <name>Phonon::MMF::EffectFactory</name>
     <message>
         <location filename="../src/3rdparty/phonon/mmf/effectfactory.cpp" line="+65"/>
-        <source>audio equalizer</source>
+        <source>Audio Equalizer</source>
         <translation>Korektor graficzny</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Bass boost</source>
+        <source>Bass Boost</source>
         <translation>Wzmocnienie basów</translation>
     </message>
     <message>
@@ -202,6 +202,14 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
     </message>
 </context>
 <context>
+    <name>Phonon::MMF::MediaObject</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/mediaobject.cpp" line="+291"/>
+        <source>Media type could not be determined</source>
+        <translation>Nie można określić typu mediów</translation>
+    </message>
+</context>
+<context>
     <name>Phonon::VolumeSlider</name>
     <message>
         <location filename="../src/3rdparty/phonon/phonon/volumeslider.cpp" line="+42"/>
@@ -268,7 +276,7 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Q3FileDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+4495"/>
+        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+4493"/>
         <source>%1
 File not found.
 Check path and filename.</source>
@@ -285,7 +293,7 @@ Sprawdź ścieżkę i nazwę pliku.</translation>
         <location line="-1924"/>
         <location line="+49"/>
         <location line="+2149"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+112"/>
+        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+133"/>
         <source>All Files (*)</source>
         <translation>Wszystkie pliki (*)</translation>
     </message>
@@ -905,8 +913,8 @@ na
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+940"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+636"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+949"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+646"/>
         <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+691"/>
         <source>Connection refused</source>
         <translation>Połączenie odrzucone</translation>
@@ -925,8 +933,8 @@ na
         <translation>Przekroczony czas połączenia</translation>
     </message>
     <message>
-        <location line="-548"/>
-        <location line="+789"/>
+        <location line="-555"/>
+        <location line="+805"/>
         <location line="+208"/>
         <source>Operation on socket is not supported</source>
         <translation>Operacja na gnieździe nieobsługiwana</translation>
@@ -970,7 +978,7 @@ na
     <message>
         <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+250"/>
         <source>Press</source>
-        <translation type="unfinished">Wciśnij</translation>
+        <translation>Wciśnij</translation>
     </message>
 </context>
 <context>
@@ -996,7 +1004,7 @@ na
         <translation>Niekompatybilność biblioteki Qt</translation>
     </message>
     <message>
-        <location filename="../src/gui/kernel/qapplication.cpp" line="+2290"/>
+        <location filename="../src/gui/kernel/qapplication.cpp" line="+2280"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
         <translation>LTR</translation>
@@ -1173,7 +1181,7 @@ na
 <context>
     <name>QDB2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1254"/>
+        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1253"/>
         <source>Unable to connect</source>
         <translation>Nie można nawiązać połączenia</translation>
     </message>
@@ -1196,7 +1204,7 @@ na
 <context>
     <name>QDB2Result</name>
     <message>
-        <location line="-1031"/>
+        <location line="-1030"/>
         <location line="+240"/>
         <source>Unable to execute statement</source>
         <translation>Nie można wykonać polecenia</translation>
@@ -1284,7 +1292,7 @@ na
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+653"/>
+        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+669"/>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
@@ -1511,7 +1519,7 @@ na
     <message>
         <location line="+23"/>
         <source>Cannot remove source file</source>
-        <translation>Nie można usunąć oryginalnego pilku</translation>
+        <translation>Nie można usunąć oryginalnego pliku</translation>
     </message>
     <message>
         <location line="+130"/>
@@ -1575,7 +1583,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Czy na pewno chcesz skasować &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location line="+425"/>
+        <location line="+419"/>
         <source>Recent Places</source>
         <translation>Ostatnie miejsca</translation>
     </message>
@@ -1586,7 +1594,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Powrót</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-410"/>
+        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-404"/>
         <source>Could not delete directory.</source>
         <translation>Nie można skasować katalogu.</translation>
     </message>
@@ -1803,9 +1811,8 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+1"/>
         <source>%1 bytes</source>
-        <translation>%1 b</translation>
+        <translation>%1 bajtów</translation>
     </message>
     <message>
         <location line="+77"/>
@@ -1854,62 +1861,67 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <source>Computer</source>
         <translation>Komputer</translation>
     </message>
+    <message>
+        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+1"/>
+        <source>%1 byte(s)</source>
+        <translation>%1 bajt(ów)</translation>
+    </message>
 </context>
 <context>
     <name>QFontDatabase</name>
     <message>
         <location filename="../src/gui/text/qfontdatabase.cpp" line="+102"/>
-        <location line="+1335"/>
+        <location line="+1342"/>
         <source>Normal</source>
         <translation>Normalny</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1339"/>
         <location line="+12"/>
-        <location line="+1308"/>
+        <location line="+1315"/>
         <source>Bold</source>
         <translation>Pogrubiony</translation>
     </message>
     <message>
-        <location line="-1317"/>
-        <location line="+1319"/>
+        <location line="-1324"/>
+        <location line="+1326"/>
         <source>Demi Bold</source>
         <translation>Na wpół pogrubiony</translation>
     </message>
     <message>
-        <location line="-1316"/>
+        <location line="-1323"/>
         <location line="+18"/>
-        <location line="+1294"/>
+        <location line="+1301"/>
         <source>Black</source>
         <translatorcomment>it&apos;s about font weight</translatorcomment>
         <translation>Bardzo gruby</translation>
     </message>
     <message>
-        <location line="-1304"/>
+        <location line="-1311"/>
         <source>Demi</source>
         <translation>Na wpół</translation>
     </message>
     <message>
         <location line="+6"/>
-        <location line="+1304"/>
+        <location line="+1311"/>
         <source>Light</source>
         <translatorcomment>it&apos;s about font weight</translatorcomment>
         <translation>Cienki</translation>
     </message>
     <message>
-        <location line="-1158"/>
-        <location line="+1161"/>
+        <location line="-1165"/>
+        <location line="+1168"/>
         <source>Italic</source>
         <translation>Kursywa</translation>
     </message>
     <message>
-        <location line="-1158"/>
-        <location line="+1160"/>
+        <location line="-1165"/>
+        <location line="+1167"/>
         <source>Oblique</source>
         <translation>Pochyły</translation>
     </message>
     <message>
-        <location line="+703"/>
+        <location line="+704"/>
         <source>Any</source>
         <translation>Każdy</translation>
     </message>
@@ -2073,6 +2085,11 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <source>Runic</source>
         <translation>Runiczny</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>N&apos;Ko</source>
+        <translation>N&apos;Ko</translation>
+    </message>
 </context>
 <context>
     <name>QFontDialog</name>
@@ -2272,7 +2289,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QHostInfo</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_p.h" line="+183"/>
+        <location filename="../src/network/kernel/qhostinfo_p.h" line="+185"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
@@ -2326,7 +2343,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Podłączony do hosta %1</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+572"/>
+        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+581"/>
         <location filename="../src/qt3support/network/q3http.cpp" line="+17"/>
         <source>Connection closed</source>
         <translation>Połączenie zakończone</translation>
@@ -2633,7 +2650,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/corelib/global/qglobal.cpp" line="+2067"/>
+        <location filename="../src/corelib/global/qglobal.cpp" line="+2081"/>
         <source>No space left on device</source>
         <translation>Brak wolnego miejsca na urządzeniu</translation>
     </message>
@@ -2653,7 +2670,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Zbyt wiele otwartych plików</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qiodevice.cpp" line="+1561"/>
+        <location filename="../src/corelib/io/qiodevice.cpp" line="+1556"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
@@ -2717,7 +2734,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Błąd podczas weryfikacji danych we wtyczce &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+350"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>Wtyczka &apos;%1&apos; używa niepoprawnej wersji biblioteki QT. (%2.%3.%4) [%5]</translation>
     </message>
@@ -2769,37 +2786,37 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QLineEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qlineedit.cpp" line="+1996"/>
+        <location filename="../src/gui/widgets/qlineedit.cpp" line="+2033"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiuj</translation>
     </message>
     <message>
-        <location line="-5"/>
+        <location line="-6"/>
         <source>Cu&amp;t</source>
         <translation>W&amp;ytnij</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+19"/>
         <source>Delete</source>
         <translation>Skasuj</translation>
     </message>
     <message>
-        <location line="-5"/>
+        <location line="-7"/>
         <source>&amp;Paste</source>
         <translation>&amp;Wklej</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-21"/>
         <source>&amp;Redo</source>
         <translation>&amp;Przywróć</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="-40"/>
         <source>&amp;Undo</source>
         <translation>&amp;Cofnij</translation>
     </message>
@@ -2808,7 +2825,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
     <name>QLocalServer</name>
     <message>
         <location filename="../src/network/socket/qlocalserver.cpp" line="+224"/>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+256"/>
+        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+246"/>
         <source>%1: Name error</source>
         <translation>%1: Błąd nazwy</translation>
     </message>
@@ -2902,7 +2919,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMYSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1423"/>
+        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1431"/>
         <source>Unable to begin transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
@@ -2912,7 +2929,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Nie można potwierdzić transakcji</translation>
     </message>
     <message>
-        <location line="-168"/>
+        <location line="-167"/>
         <source>Unable to connect</source>
         <translation>Nie można nawiązać połączenia</translation>
     </message>
@@ -2922,7 +2939,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Nie można otworzyć bazy danych &apos;</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+195"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
@@ -2930,7 +2947,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMYSQLResult</name>
     <message>
-        <location line="-433"/>
+        <location line="-432"/>
         <location line="+21"/>
         <source>Unable to bind outvalues</source>
         <translation>Nie można powiązać wartości zewnętrznych</translation>
@@ -2951,12 +2968,13 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Nie można wykonać polecenia</translation>
     </message>
     <message>
-        <location line="-522"/>
+        <location line="-531"/>
+        <location line="+31"/>
         <source>Unable to fetch data</source>
         <translation>Nie można pobrać danych</translation>
     </message>
     <message>
-        <location line="+380"/>
+        <location line="+358"/>
         <location line="+8"/>
         <source>Unable to prepare statement</source>
         <translation>Nie można przygotować polecenia</translation>
@@ -3332,27 +3350,30 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessFileBackend</name>
     <message>
+        <location filename="../src/network/access/qfilenetworkreply.cpp" line="+83"/>
         <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+100"/>
         <source>Request for opening non-local file %1</source>
         <translation>Żądanie otwarcia zdalnego pliku %1</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+31"/>
+        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+45"/>
         <source>Error opening %1: %2</source>
         <translation>Błąd otwierania %1: %2</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+38"/>
         <source>Write error writing to %1: %2</source>
         <translation>Błąd w trakcie zapisywania do %1: %2</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location filename="../src/network/access/qfilenetworkreply.cpp" line="-11"/>
+        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+48"/>
         <source>Cannot open %1: Path is a directory</source>
         <translation>Nie można otworzyć %1: Ścieżka jest katalogiem</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+21"/>
         <source>Read error reading from %1: %2</source>
         <translation>Błąd w trakcie czytania z %1: %2</translation>
     </message>
@@ -3418,7 +3439,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QOCIDriver</name>
     <message>
-        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+1932"/>
+        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+1939"/>
         <source>Unable to initialize</source>
         <comment>QOCIDriver</comment>
         <translation>Nie można dokonać inicjalizacji</translation>
@@ -3447,8 +3468,8 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QOCIResult</name>
     <message>
-        <location line="-972"/>
-        <location line="+161"/>
+        <location line="-979"/>
+        <location line="+168"/>
         <location line="+15"/>
         <source>Unable to bind column for batch execute</source>
         <translation>Nie można powiązać kolumny dla wykonania zestawu poleceń</translation>
@@ -3552,7 +3573,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Nie można przygotować polecenia</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+190"/>
+        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+189"/>
         <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-199"/>
         <location line="+576"/>
         <source>Unable to fetch last</source>
@@ -3611,7 +3632,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QPPDOptionsModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1198"/>
+        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1197"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
@@ -3919,15 +3940,15 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
     <message>
         <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+24"/>
         <source>Print all</source>
-        <translation>Wydrukuj wszystko</translation>
+        <translation>Drukuj wszystko</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Print range</source>
-        <translation>Wydrukuj zakres</translation>
+        <translation>Drukuj zakres</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+471"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+473"/>
         <location line="+199"/>
         <source>unknown</source>
         <translation>nieznany</translation>
@@ -3972,15 +3993,15 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <location line="+13"/>
         <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="-2"/>
         <source>Print</source>
-        <translation>Wydrukuj</translation>
+        <translation>Drukowanie</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-357"/>
+        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-359"/>
         <source>Print To File ...</source>
-        <translation>Wydrukuj do pliku ...</translation>
+        <translation>Drukuj do pliku ...</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+82"/>
         <source>File %1 is not writable.
 Please choose a different file name.</source>
         <translation>Plik %1 jest plikiem tylko do odczytu.
@@ -4013,7 +4034,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+227"/>
         <source>Print selection</source>
-        <translation>Wydrukuj zaznaczone</translation>
+        <translation>Drukuj zaznaczone</translation>
     </message>
     <message>
         <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="-232"/>
@@ -4171,7 +4192,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Niestandardowy</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-524"/>
+        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-523"/>
         <location line="+68"/>
         <source>&amp;Options &gt;&gt;</source>
         <translation>&amp;Opcje &gt;&gt;</translation>
@@ -4179,7 +4200,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-63"/>
         <source>&amp;Print</source>
-        <translation>&amp;Drukuj</translation>
+        <translation>Wy&amp;drukuj</translation>
     </message>
     <message>
         <location line="+67"/>
@@ -4189,12 +4210,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+253"/>
         <source>Print to File (PDF)</source>
-        <translation>Wydrukuj do pliku (PDF)</translation>
+        <translation>Drukuj do pliku (PDF)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Print to File (Postscript)</source>
-        <translation>Wydrukuj do pliku (Postscript)</translation>
+        <translation>Drukuj do pliku (Postscript)</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -4222,7 +4243,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+68"/>
         <source>Print Preview</source>
-        <translation>Wydrukuj podgląd</translation>
+        <translation>Podgląd wydruku</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -4349,12 +4370,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location/>
         <source>Print range</source>
-        <translation>Wydrukuj zakres</translation>
+        <translation>Zakres wydruku</translation>
     </message>
     <message>
         <location/>
         <source>Print all</source>
-        <translation>Wydrukuj wszystko</translation>
+        <translation>Drukuj wszystko</translation>
     </message>
     <message>
         <location/>
@@ -4483,7 +4504,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QProcess</name>
     <message>
-        <location filename="../src/corelib/io/qprocess_unix.cpp" line="+402"/>
+        <location filename="../src/corelib/io/qprocess_unix.cpp" line="+406"/>
         <location filename="../src/corelib/io/qprocess_win.cpp" line="+137"/>
         <source>Could not open input redirection for reading</source>
         <translation>Nie można otworzyć wejściowego przekierowania do odczytu</translation>
@@ -4500,7 +4521,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Błąd zasobów (błąd forkowania): %1</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+258"/>
         <location line="+52"/>
         <location line="+74"/>
         <location line="+66"/>
@@ -4664,7 +4685,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSQLiteDriver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+555"/>
+        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+551"/>
         <source>Error closing database</source>
         <translation>Błąd zamykania bazy danych</translation>
     </message>
@@ -4707,8 +4728,8 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Nie można wykonać polecenia</translation>
     </message>
     <message>
-        <location line="-133"/>
-        <location line="+66"/>
+        <location line="-129"/>
+        <location line="+62"/>
         <location line="+8"/>
         <source>Unable to fetch row</source>
         <translation>Nie można pobrać wiersza danych</translation>
@@ -4719,7 +4740,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Nie można skasować polecenia</translation>
     </message>
     <message>
-        <location line="-152"/>
+        <location line="-148"/>
         <source>No query</source>
         <translation>Brak zapytania</translation>
     </message>
@@ -4744,7 +4765,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+2"/>
         <source>Ignore-count</source>
-        <translation type="unfinished"></translation>
+        <translation>Licznik pominięć</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4754,7 +4775,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+2"/>
         <source>Hit-count</source>
-        <translation>Ilość trafień</translation>
+        <translation>Licznik trafień</translation>
     </message>
 </context>
 <context>
@@ -5031,7 +5052,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+6"/>
         <source>Debug Output</source>
-        <translation>Wyjscie debuggera</translation>
+        <translation>Wyjście debuggera</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -5167,7 +5188,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
         <location filename="../src/corelib/kernel/qsharedmemory_symbian.cpp" line="+83"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+80"/>
+        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+81"/>
         <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+87"/>
         <source>%1: permission denied</source>
         <translation>%1: brak dostępu</translation>
@@ -5262,7 +5283,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+1143"/>
+        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+1249"/>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -5273,12 +5294,12 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Alt</translation>
     </message>
     <message>
-        <location line="-767"/>
+        <location line="-871"/>
         <source>Back</source>
         <translation>Back</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-25"/>
         <source>Backspace</source>
         <translation>Backspace</translation>
     </message>
@@ -5288,7 +5309,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Backtab</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+33"/>
         <source>Bass Boost</source>
         <translation>Wzmocnienie basów</translation>
     </message>
@@ -5303,7 +5324,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Basy w górę</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+149"/>
         <source>Call</source>
         <translation>Wywołaj</translation>
     </message>
@@ -5313,12 +5334,457 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Caps Lock</translation>
     </message>
     <message>
-        <location line="-53"/>
+        <location line="-145"/>
         <source>CapsLock</source>
         <translation>CapsLock</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+49"/>
+        <source>Monitor Brightness Up</source>
+        <translation>Zwiększ jasność monitora</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monitor Brightness Down</source>
+        <translation>Zmniejsz jasność monitora</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keyboard Light On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keyboard Brightness Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keyboard Brightness Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Power Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wake Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Eject</source>
+        <translation>Wysuń</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Screensaver</source>
+        <translation>Wygaszacz ekranu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>WWW</source>
+        <translation>WWW</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sleep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LightBulb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Shop</source>
+        <translation>Sklep</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>History</source>
+        <translation>Historia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add Favorite</source>
+        <translation>Dodaj do ulubionych</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hot Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Finance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Community</source>
+        <translation>Społeczność</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio Rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Back Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Application Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Application Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Book</source>
+        <translation>Książka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CD</source>
+        <translation>CD</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Calculator</source>
+        <translation>Kalkulator</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear</source>
+        <translation>Wyczyść</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear Grab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation>Skopiuj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Wytnij</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>DOS</source>
+        <translation>DOS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Documents</source>
+        <translation>Dokumenty</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Spreadsheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Browser</source>
+        <translation>Przeglądarka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go</source>
+        <translation>Przejdź</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>iTouch</source>
+        <translation>iTouch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Logoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Market</source>
+        <translation>Rynek</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Meeting</source>
+        <translation>Spotkanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keyboard Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Menu PB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>My Sites</source>
+        <translation>Moje strony</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>News</source>
+        <translation>Wiadomości</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Home Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Option</source>
+        <translation>Opcje</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation>Wklej</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Phone</source>
+        <translation>Telefon</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reply</source>
+        <translation>Odpowiedz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reload</source>
+        <translation>Przeładuj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rotate Windows</source>
+        <translation>Obróć okna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rotation PB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rotation KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation>Zachowaj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Send</source>
+        <translation>Wyślij</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Spellchecker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Split Screen</source>
+        <translation>Podziel ekran</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Support</source>
+        <translation>Pomoc techniczna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Task Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Terminal</source>
+        <translation>Terminal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tools</source>
+        <translation>Narzędzia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Travel</source>
+        <translation>Podróże</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video</source>
+        <translation>Wideo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Word Processor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>XFer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom In</source>
+        <translation>Powiększ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom Out</source>
+        <translation>Pomniejsz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Away</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Messenger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>WebCam</source>
+        <translation>WebCam</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mail Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pictures</source>
+        <translation>Zdjęcia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Music</source>
+        <translation>Muzyka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Battery</source>
+        <translation>Bateria</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bluetooth</source>
+        <translation>Bluetooth</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wireless</source>
+        <translation>Bezprzewodowy</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ultra Wide Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio Random Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Subtitle</source>
+        <translation>Napisy</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio Cycle Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>View</source>
+        <translation>Widok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Top Menu</source>
+        <translation>Menu główne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Suspend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hibernate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Context1</source>
         <translation>Kontekst1</translation>
     </message>
@@ -5338,23 +5804,23 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Kontekst4</translation>
     </message>
     <message>
-        <location line="+564"/>
+        <location line="+578"/>
         <location line="+135"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-890"/>
         <source>Del</source>
         <translation>Del</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+162"/>
         <source>Delete</source>
         <translation>Delete</translation>
     </message>
     <message>
-        <location line="-61"/>
+        <location line="-153"/>
         <source>Down</source>
         <translation>Dół</translation>
     </message>
@@ -5374,37 +5840,37 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Esc</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+170"/>
         <source>Escape</source>
         <translation>Escape</translation>
     </message>
     <message>
-        <location line="+732"/>
+        <location line="+746"/>
         <source>F%1</source>
         <translation>F%1</translation>
     </message>
     <message>
-        <location line="-766"/>
+        <location line="-870"/>
         <source>Favorites</source>
         <translation>Ulubione</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+141"/>
         <source>Flip</source>
         <translation>Odwróć</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-158"/>
         <source>Forward</source>
         <translation>Do przodu</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+157"/>
         <source>Hangup</source>
         <translation>Zawieś</translation>
     </message>
     <message>
-        <location line="-71"/>
+        <location line="-163"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
@@ -5414,22 +5880,22 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Home</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Home Page</source>
         <translation>Strona startowa</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-39"/>
         <source>Ins</source>
         <translation>Ins</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+162"/>
         <source>Insert</source>
         <translation>Insert</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-116"/>
         <source>Launch (0)</source>
         <translation>Uruchom (0)</translation>
     </message>
@@ -5519,14 +5985,14 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Uruchom przeglądarkę mediów</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-38"/>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>Media Next</source>
-        <translation>Następna ścieżka </translation>
+        <translation>Następna ścieżka</translation>
     </message>
     <message>
         <location line="-3"/>
@@ -5549,18 +6015,18 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Zatrzymaj</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-19"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location line="+637"/>
+        <location line="+743"/>
         <location line="+130"/>
         <source>Meta</source>
         <translation>Meta</translation>
     </message>
     <message>
-        <location line="-704"/>
+        <location line="-718"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
@@ -5575,17 +6041,17 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Number Lock</translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-146"/>
         <source>NumLock</source>
         <translation>NumLock</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Open URL</source>
         <translation>Otwórz adres</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+114"/>
         <source>Page Down</source>
         <translation>Strona do góry</translation>
     </message>
@@ -5595,7 +6061,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Strona w dół</translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-154"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
@@ -5612,20 +6078,20 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-8"/>
         <source>Print</source>
-        <translation>Print</translation>
+        <translation>Wydrukuj</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+152"/>
         <source>Print Screen</source>
         <translation>Wydrukuj zawartość ekranu</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-130"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-27"/>
         <source>Return</source>
         <translation>Powrót</translation>
     </message>
@@ -5635,38 +6101,39 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Prawo</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+152"/>
         <source>Scroll Lock</source>
         <translation>Scroll Lock</translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-146"/>
         <source>ScrollLock</source>
         <translation>ScrollLock</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+26"/>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+106"/>
+        <location line="+22"/>
         <source>Select</source>
         <translation>Wybierz</translation>
     </message>
     <message>
-        <location line="+574"/>
+        <location line="+588"/>
         <location line="+138"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location line="-796"/>
+        <location line="-902"/>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+49"/>
         <source>Standby</source>
         <translation>Tryb oczekiwania</translation>
     </message>
@@ -5676,22 +6143,22 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Zatrzymaj</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="-20"/>
         <source>SysReq</source>
         <translation>SysReq</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+161"/>
         <source>System Request</source>
         <translation>Żądanie systemu</translation>
     </message>
     <message>
-        <location line="-78"/>
+        <location line="-170"/>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>Treble Down</source>
         <translation>Soprany w dół</translation>
     </message>
@@ -5701,12 +6168,12 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Soprany w górę</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-24"/>
         <source>Up</source>
         <translation>Góra</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+18"/>
         <source>Volume Down</source>
         <translation>Przycisz</translation>
     </message>
@@ -5721,7 +6188,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Zrób głośniej</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+142"/>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
@@ -5822,7 +6289,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Nieznany kod błędu (0x%1) pośrednika SOCKS wersji 5</translation>
     </message>
     <message>
-        <location line="+685"/>
+        <location line="+689"/>
         <source>Network operation timed out</source>
         <translation>Przekroczony czas operacji sieciowej</translation>
     </message>
@@ -5830,7 +6297,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSoftKeyManager</name>
     <message>
-        <location filename="../src/gui/kernel/qsoftkeymanager.cpp" line="+78"/>
+        <location filename="../src/gui/kernel/qsoftkeymanager.cpp" line="+79"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
@@ -5855,7 +6322,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+176"/>
         <source>Exit</source>
         <translation>Wyjście</translation>
     </message>
@@ -5958,7 +6425,12 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Niepoprawna lub pusta lista szyfrów (%1)</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+42"/>
+        <source>Private key does not certify public key, %1</source>
+        <translation>Prywatny klucz nie uwiarygodnia publicznego, %1</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Error creating SSL session, %1</source>
         <translation>Błąd tworzenia sesji SSL, %1</translation>
     </message>
@@ -5983,15 +6455,125 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Błąd ładowania prywatnego klucza, %1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Private key does not certificate public key, %1</source>
-        <translation>Prywatny klucz nie uwiarygodnia publicznego, %1</translation>
+        <location filename="../src/network/ssl/qsslerror.cpp" line="+213"/>
+        <source>No error</source>
+        <translation>Brak błędu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The issuer certificate could not be found</source>
+        <translation>Nie można odnaleźć wydawcy certyfikatu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The certificate signature could not be decrypted</source>
+        <translation>Nie można odszyfrować podpisu certyfikatu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The public key in the certificate could not be read</source>
+        <translation>Nie można odczytać publicznego klucza w certyfikacie</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The signature of the certificate is invalid</source>
+        <translation>Niepoprawny podpis certyfikatu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The certificate is not yet valid</source>
+        <translation>Certyfikat nie jest jeszcze ważny</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The certificate has expired</source>
+        <translation>Certyfikat utracił ważność</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The certificate&apos;s notBefore field contains an invalid time</source>
+        <translation>Pole &quot;notBefore&quot; certyfikatu zawiera niepoprawną datę</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The certificate&apos;s notAfter field contains an invalid time</source>
+        <translation>Pole &quot;notAfter&quot; certyfikatu zawiera niepoprawną datę</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The certificate is self-signed, and untrusted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The root certificate of the certificate chain is self-signed, and untrusted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The issuer certificate of a locally looked up certificate could not be found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>No certificates could be verified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>One of the CA certificates is invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The basicConstraints path length parameter has been exceeded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The supplied certificate is unsuitable for this purpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The root CA certificate is not trusted for this purpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The root CA certificate is marked to reject the specified purpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>The peer did not present any certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The host name did not match any of the valid hosts for this certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unknown error</source>
+        <translation>Nieznany błąd</translation>
     </message>
 </context>
 <context>
     <name>QStateMachine</name>
     <message>
-        <location filename="../src/corelib/statemachine/qstatemachine.cpp" line="+998"/>
+        <location filename="../src/corelib/statemachine/qstatemachine.cpp" line="+1028"/>
         <source>Missing initial state in compound state &apos;%1&apos;</source>
         <translation>Brak stanu początkowego w stanie złożonym &apos;%1&apos;</translation>
     </message>
@@ -6045,7 +6627,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QTDSDriver</name>
     <message>
-        <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+584"/>
+        <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+595"/>
         <source>Unable to open connection</source>
         <translation>Nie można otworzyć połączenia</translation>
     </message>
@@ -6079,7 +6661,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QTextControl</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+2018"/>
+        <location filename="../src/gui/text/qtextcontrol.cpp" line="+2034"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiuj</translation>
     </message>
@@ -6179,7 +6761,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QUnicodeControlCharacterMenu</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+933"/>
+        <location filename="../src/gui/text/qtextcontrol.cpp" line="+948"/>
         <source>Insert Unicode control character</source>
         <translation>Wstaw znak kontroli Unicode</translation>
     </message>
@@ -6237,7 +6819,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWebFrame</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+711"/>
+        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+712"/>
         <source>Request cancelled</source>
         <translation>Prośba anulowana</translation>
     </message>
@@ -6657,13 +7239,13 @@ Proszę wybrać inną nazwę pliku.</translation>
         <location line="+2"/>
         <source>Movie time scrubber</source>
         <comment>Media controller element</comment>
-        <translation type="unfinished"></translation>
+        <translation>Suwak czasu</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Movie time scrubber thumb</source>
         <comment>Media controller element</comment>
-        <translation type="unfinished"></translation>
+        <translation>Uchwyt suwaka czasu</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6779,7 +7361,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Wizytator sieciowy - %2</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+406"/>
+        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+416"/>
         <source>Bad HTTP request</source>
         <translation>Niepoprawna komenda HTTP</translation>
     </message>
@@ -6883,7 +7465,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1708"/>
+        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1827"/>
         <source>JavaScript Alert - %1</source>
         <translation>Ostrzeżenie JavaScript - %1</translation>
     </message>
@@ -6908,9 +7490,9 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Skrypt na tej stronie nie działa poprawnie. Czy chcesz przerwać ten skrypt?</translation>
     </message>
     <message>
-        <location line="+383"/>
+        <location line="+381"/>
         <source>Move the cursor to the next character</source>
-        <translation>Przesuń kursor do nastepnego znaku</translation>
+        <translation>Przesuń kursor do następnego znaku</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6920,7 +7502,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+3"/>
         <source>Move the cursor to the next word</source>
-        <translation>Przesuń kursor do nastepnego słowa</translation>
+        <translation>Przesuń kursor do następnego słowa</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6930,7 +7512,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+3"/>
         <source>Move the cursor to the next line</source>
-        <translation>Przesuń kursor do nastepnej linii</translation>
+        <translation>Przesuń kursor do następnej linii</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7080,7 +7662,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+4"/>
         <source>Insert Bulleted List</source>
-        <translation>Wstaw listę wypunktową</translation>
+        <translation>Wstaw listę wypunktowaną</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7129,7 +7711,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../src/gui/kernel/qwidget.cpp" line="+5672"/>
+        <location filename="../src/gui/kernel/qwidget.cpp" line="+5723"/>
         <source>*</source>
         <translation>*</translation>
     </message>
@@ -7557,7 +8139,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+274"/>
         <source>The standalone pseudo attribute must appear after the encoding.</source>
-        <translation>Pseudo atrybut &quot;standalone&quot; musi pojawić sie po &quot;encoding&quot;.</translation>
+        <translation>Pseudo atrybut &quot;standalone&quot; musi pojawić się po &quot;encoding&quot;.</translation>
     </message>
     <message>
         <location filename="../src/corelib/xml/qxmlstream_p.h" line="+562"/>
@@ -7752,17 +8334,22 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+32"/>
         <source>A positional predicate must evaluate to a single numeric value.</source>
-        <translation>Wynikiem predykatu pozycyjnego musi być pojedyńcza wartość liczbowa.</translation>
+        <translation>Wynikiem predykatu pozycyjnego musi być pojedyncza wartość liczbowa.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qncnameconstructor_p.h" line="+137"/>
+        <location filename="../src/xmlpatterns/expr/qncnameconstructor_p.h" line="+113"/>
+        <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.</source>
+        <translation>Docelowa nazwa w instrukcji przetwarzania nie może być %1 w żadnej kombinacji wielkich i małych liter. Dlatego nazwa %2 jest niepoprawna.</translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source>
         <translation>%1 nie jest poprawną nazwą docelową w instrukcji przetwarzania. Nazwa musi być wartością %2, np. %3.</translation>
     </message>
     <message>
         <location filename="../src/xmlpatterns/expr/qpath.cpp" line="+109"/>
         <source>The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.</source>
-        <translation>Ostatni krok w ścieżce musi zawierać albo wezły albo wartości atomowe. Nie może zawierać obu jednocześnie.</translation>
+        <translation>Ostatni krok w ścieżce musi zawierać albo węzły albo wartości atomowe. Nie może zawierać obu jednocześnie.</translation>
     </message>
     <message>
         <location filename="../src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp" line="+84"/>
@@ -7818,7 +8405,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location filename="../src/xmlpatterns/functions/qpatternmatchingfns.cpp" line="+94"/>
         <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source>
-        <translation>Po %1 musi następowac %2 lub %3, lecz nie na końcu zastępczego ciągu.</translation>
+        <translation>Po %1 musi następować %2 lub %3, lecz nie na końcu zastępczego ciągu.</translation>
     </message>
     <message>
         <location line="+39"/>
@@ -7907,7 +8494,12 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>%1 jest nieznanym typem schematu.</translation>
     </message>
     <message>
-        <location line="-7041"/>
+        <location line="-7254"/>
+        <source>A template with name %1 has already been declared.</source>
+        <translation>Szablon o nazwie %1 został już zadeklarowany.</translation>
+    </message>
+    <message>
+        <location line="+213"/>
         <source>Only one %1 declaration can occur in the query prolog.</source>
         <translation>Tylko jedna deklaracja %1 może się pojawić w prologu zapytania.</translation>
     </message>
@@ -7962,12 +8554,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Cecha &quot;Import modułu&quot; nie jest obsługiwana</translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>No value is available for the external variable by name %1.</source>
-        <translation>Brak wartości dla zewnętrznej zmiennej o nazwie %1.</translation>
-    </message>
-    <message>
-        <location line="+114"/>
+        <location line="+166"/>
         <source>The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.</source>
         <translation>Przestrzeń nazw %1 jest zarezerwowana, dlatego funkcje zdefiniowane przez użytkownika nie mogą jej użyć. Spróbuj predefiniowany przedrostek %2, który istnieje w takich przypadkach.</translation>
     </message>
@@ -7987,12 +8574,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Zewnętrzne funkcje nie są obsługiwane. Wszystkie obsługiwane funkcje mogą być używane bezpośrednio, bez ich uprzedniego deklarowania jako zewnętrzne</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
-        <translation>Argument o nazwie %1 został już zadeklarowany. Każda nazwa argumentu musi być unikatowa.</translation>
-    </message>
-    <message>
-        <location line="+456"/>
+        <location line="+493"/>
         <source>The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.</source>
         <translation>Nazwa zmiennej powiązanej w wyrażeniu &quot;for&quot; musi być inna od zmiennej pozycjonującej. W związku z tym dwie zmienne o nazwie %1 kolidują ze sobą.</translation>
     </message>
@@ -8019,12 +8601,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-152"/>
         <source>W3C XML Schema identity constraint selector</source>
-        <translation>Selektor ograniczenia jednostki W3C XML Schema</translation>
+        <translation>Selektor narzucenia niepowtarzalności W3C XML Schema</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>W3C XML Schema identity constraint field</source>
-        <translation>Pole ograniczenia jednostki W3C XML Schema</translation>
+        <translation>Pole narzucenia niepowtarzalności W3C XML Schema</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -8032,37 +8614,37 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Wystąpiła konstrukcja która jest niedozwolona w bieżącym języku (%1).</translation>
     </message>
     <message>
-        <location line="+583"/>
-        <source>No variable by name %1 exists</source>
-        <translation>Zmienna o nazwie %1 nie istnieje</translation>
-    </message>
-    <message>
-        <location line="-464"/>
-        <source>A template by name %1 has already been declared.</source>
-        <translation>Szablon o nazwie %1 został już zadeklarowany.</translation>
+        <location line="+3700"/>
+        <source>The keyword %1 cannot occur with any other mode name.</source>
+        <translation>Słowo kluczowe %1 nie może wystąpić z inną nazwą trybu.</translation>
     </message>
     <message>
-        <location line="+3581"/>
-        <source>The keyword %1 cannot occur with any other mode name.</source>
-        <translation>Słowo kluczowe %1 nie może wystapić z inną nazwą trybu.</translation>
+        <location line="-3117"/>
+        <source>No variable with name %1 exists</source>
+        <translation>Zmienna o nazwie %1 nie istnieje</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>The value of attribute %1 must of type %2, which %3 isn&apos;t.</source>
+        <location line="+3146"/>
+        <source>The value of attribute %1 must be of type %2, which %3 isn&apos;t.</source>
         <translation>Wartość atrybutu %1 musi być typu %2, którym nie jest %3.</translation>
     </message>
     <message>
         <location line="+75"/>
-        <source>The prefix %1 can not be bound. By default, it is already bound to the namespace %2.</source>
+        <source>The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.</source>
         <translation>Przedrostek %1 nie może być powiązany. Jest on domyślnie powiązany z przestrzenią nazw %2.</translation>
     </message>
     <message>
         <location line="+312"/>
-        <source>A variable by name %1 has already been declared.</source>
+        <source>A variable with name %1 has already been declared.</source>
         <translation>Zmienna o nazwie %1 została już zadeklarowana.</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+39"/>
+        <source>No value is available for the external variable with name %1.</source>
+        <translation>Brak wartości dla zewnętrznej zmiennej o nazwie %1.</translation>
+    </message>
+    <message>
+        <location line="+96"/>
         <source>A stylesheet function must have a prefixed name.</source>
         <translation>Funkcja arkusza stylu musi zawierać nazwę z przedrostkiem.</translation>
     </message>
@@ -8072,7 +8654,12 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Przestrzeń nazw dla funkcji zdefiniowanej przez użytkownika nie może być pusta (spróbuj predefiniowany przedrostek %1, który stworzono specjalnie do takich sytuacji)</translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+115"/>
+        <source>An argument with name %1 has already been declared. Every argument name must be unique.</source>
+        <translation>Argument o nazwie %1 został już zadeklarowany. Każda nazwa argumentu musi być unikatowa.</translation>
+    </message>
+    <message>
+        <location line="+179"/>
         <source>When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.</source>
         <translation>Gdy funkcja %1 jest wykorzystana do dopasowania wewnątrz wzorca, jej argument musi być referencją do zmiennej lub napisem.</translation>
     </message>
@@ -8113,11 +8700,16 @@ Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
         <location line="+462"/>
-        <source>No function by name %1 is available.</source>
+        <source>No function with name %1 is available.</source>
         <translation>Żadna funkcja o nazwie %1 nie jest dostępna.</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+250"/>
+        <source>An attribute with name %1 has already appeared on this element.</source>
+        <translation>Atrybut o nazwie %1 już się pojawił w tym elemencie.</translation>
+    </message>
+    <message>
+        <location line="-148"/>
         <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
         <translation>Przestrzeń nazw URI nie może być pustym ciągiem w powiązaniu z przedrostkiem, %1.</translation>
     </message>
@@ -8152,12 +8744,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Przestrzeń nazw URI nie może być stałą i nie może używać zawartych w niej wyrażeń.</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>An attribute by name %1 has already appeared on this element.</source>
-        <translation>Atrybut o nazwie %1 już się pojawił w tym elemencie.</translation>
-    </message>
-    <message>
-        <location line="+61"/>
+        <location line="+77"/>
         <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
         <translation>Konstruktor elementu bezpośredniego nie jest dobrze sformatowany. %1 jest zakończony %2.</translation>
     </message>
@@ -8262,11 +8849,6 @@ Proszę wybrać inną nazwę pliku.</translation>
         <source>Modulus division (%1) by zero (%2) is undefined.</source>
         <translation>Dzielenie modulo (%1) przez zero (%2) jest niezdefiniowane.</translation>
     </message>
-    <message>
-        <location filename="../src/xmlpatterns/expr/qncnameconstructor_p.h" line="-24"/>
-        <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid.</source>
-        <translation>Docelowa nazwa w instrukcji przetwarzania nie może być %1 w żadnej kombinacji wielkich i małych liter. Dlatego nazwa %2 jest niepoprawna.</translation>
-    </message>
     <message numerus="yes">
         <location filename="../src/xmlpatterns/functions/qabstractfunctionfactory.cpp" line="+77"/>
         <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source>
@@ -8409,7 +8991,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+166"/>
         <source>In a simplified stylesheet module, attribute %1 must be present.</source>
-        <translation>W uproszczonym module arkuszu stylu musi wystapić atrybut %1.</translation>
+        <translation>W uproszczonym module arkuszu stylu musi wystąpić atrybut %1.</translation>
     </message>
     <message>
         <location line="+72"/>
@@ -8419,7 +9001,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+9"/>
         <source>Element %1 must have at least one of the attributes %2 or %3.</source>
-        <translation>Element %1 musi posiadać przynajmiej jeden z atrybutów: %2 lub %3.</translation>
+        <translation>Element %1 musi posiadać przynajmniej jeden z atrybutów: %2 lub %3.</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -8531,12 +9113,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+25"/>
         <source>%1 is not allowed to derive from %2 by restriction as the latter defines it as final.</source>
-        <translation>Nie można wywieść %1 z %2 ograniczając go ponieważ jest on zdefiniowany jako ostateczny.</translation>
+        <translation>Nie można wywieść %1 z %2 ograniczając go ponieważ jest on zdefiniowany jako końcowy.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 is not allowed to derive from %2 by extension as the latter defines it as final.</source>
-        <translation>Nie można wywieść %1 z %2 rozszerzając go ponieważ jest on zdefiniowany jako ostateczny.</translation>
+        <translation>Nie można wywieść %1 z %2 rozszerzając go ponieważ jest on zdefiniowany jako końcowy.</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -8562,13 +9144,13 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+6"/>
         <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source>
-        <translation>Typ prosty %1 nie może wywodzić się z %2 ponieważ ten ostatni jest zdefiniowany jako ostateczny.</translation>
+        <translation>Typ prosty %1 nie może wywodzić się z %2 ponieważ ten ostatni jest zdefiniowany jako końcowy.</translation>
     </message>
     <message>
         <location line="+13"/>
         <location line="+484"/>
         <source>Variety of item type of %1 must be either atomic or union.</source>
-        <translation>Typem elementu %1 musi być albo typ atomowy albo unia.</translation>
+        <translation>Typem elementów listy %1 musi być albo typ atomowy albo unia.</translation>
     </message>
     <message>
         <location line="-474"/>
@@ -8595,12 +9177,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+6"/>
         <source>Base type of simple type %1 has defined derivation by restriction as final.</source>
-        <translation>Typ podstawowy dla typu prostego %1 ma zdefiniowane wywodzenie poprzez ograniczenie jako ostateczne.</translation>
+        <translation>Typ podstawowy dla typu prostego %1 ma zdefiniowane wywodzenie poprzez ograniczenie jako końcowe.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Item type of base type does not match item type of %1.</source>
-        <translation>Typ elementu w podstawowym typie nie pasuje do typu %1.</translation>
+        <translation>Typ elementów listy typu podstawowego nie pasuje do typu elementów listy %1.</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -8657,7 +9239,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+37"/>
         <source>Content model of complex type %1 is not a valid extension of content model of %2.</source>
-        <translation>Model zawartości typu złożonego %1 nie jest poprawnym rozszerzenien modelu zawartości %2.</translation>
+        <translation>Model zawartości typu złożonego %1 nie jest poprawnym rozszerzeniem modelu zawartości %2.</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -8687,7 +9269,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+35"/>
         <source>Item type of simple type %1 cannot be a complex type.</source>
-        <translation>Typ elementu w prostym typie %1 nie może być typem złożonym.</translation>
+        <translation>Typ elementów listy w prostym typie %1 nie może być typem złożonym.</translation>
     </message>
     <message>
         <location line="+44"/>
@@ -8731,7 +9313,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-389"/>
         <source>%1 facet contains invalid regular expression</source>
-        <translation>Aspekt %1 zawiera niepoprawe wyrażenie regularne</translation>
+        <translation>Aspekt %1 zawiera niepoprawne wyrażenie regularne</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -8902,7 +9484,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+18"/>
         <source>processContent of base wildcard must be weaker than derived wildcard.</source>
-        <translation>&quot;processContent&quot; podstawowego znacznika musi być słabszy od wywiedzionego znacznika.</translation>
+        <translation>&quot;processContent&quot; podstawowego dżokera musi być słabszy od wywiedzionego dżokera.</translation>
     </message>
     <message>
         <location line="+39"/>
@@ -8913,7 +9495,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+28"/>
         <source>Particle contains non-deterministic wildcards.</source>
-        <translation>Element zawiera nieokreślone znaczniki.</translation>
+        <translation>Element zawiera nieokreślone dżokery.</translation>
     </message>
     <message>
         <location filename="../src/xmlpatterns/schema/qxsdschemahelper.cpp" line="+691"/>
@@ -8933,13 +9515,13 @@ Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Derived attribute %1 does not exists in the base definition.</source>
-        <translation>Wywyiedziony atrybut %1 nie istnieje w podstawowej definicji.</translation>
+        <source>Derived attribute %1 does not exist in the base definition.</source>
+        <translation>Wywiedziony atrybut %1 nie istnieje w podstawowej definicji.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Derived attribute %1 does not match the wildcard in the base definition.</source>
-        <translation>Wywiedziony atrybut %1 nie pasuje do znacznika w podstawowej definicji.</translation>
+        <translation>Wywiedziony atrybut %1 nie pasuje do dżokera w podstawowej definicji.</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -8954,12 +9536,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+5"/>
         <source>Derived wildcard is not a subset of the base wildcard.</source>
-        <translation>Wywiedziony znacznik nie jest podzbiorem podstawowego znacznika.</translation>
+        <translation>Wywiedziony dżoker nie jest podzbiorem podstawowego dżokera.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 of derived wildcard is not a valid restriction of %2 of base wildcard</source>
-        <translation>%1 wywiedzionego znacznika nie jest poprawnym ograniczeniem %2 podstawowego znacznika</translation>
+        <translation>%1 wywiedzionego dżokera nie jest poprawnym ograniczeniem %2 podstawowego dżokera</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -8984,12 +9566,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+10"/>
         <source>%1 references identity constraint %2 that is no %3 or %4 element.</source>
-        <translation>%1 odwołuje się do ograniczenia jednostki %2 które nie jest elementem %3 ani %4.</translation>
+        <translation>%1 odwołuje się do narzucenia niepowtarzalności %2 które nie jest elementem %3 ani %4.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>%1 has a different number of fields from the identity constraint %2 that it references.</source>
-        <translation>%1 posiada inna liczbę pól od ograniczenia jednostki %2 które się do niego odwołuje.</translation>
+        <translation>%1 posiada inna liczbę pól od narzucenia niepowtarzalności %2 które się do niego odwołuje.</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -8999,7 +9581,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+84"/>
         <source>Item type %1 of %2 element cannot be resolved.</source>
-        <translation>Nie można rozwiązać typu elementu %1 w elemencie %2.</translation>
+        <translation>Nie można rozwiązać typu elementów listy %1 w elemencie %2.</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -9100,17 +9682,17 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+52"/>
         <source>Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.</source>
-        <translation>Znacznik atrybutu %1 nie jest poprawnym ograniczeniem znacznika atrybutu typu podstawowego %2.</translation>
+        <translation>Atrybut dżokera %1 nie jest poprawnym ograniczeniem atrybutu dżokera typu podstawowego %2.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>%1 has attribute wildcard but its base type %2 has not.</source>
-        <translation>%1 posiada znacznik atrybutu lecz jego typ podstawowy %2 go nie posiada.</translation>
+        <translation>%1 posiada atrybut dżokera lecz jego typ podstawowy %2 go nie posiada.</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.</source>
-        <translation>Nie można wyrazić unii znacznika atrybutu typu %1 i znacznika atrybutu jego typu podstawowego %2.</translation>
+        <translation>Nie można wyrazić unii atrybutu dżokera typu %1 i atrybutu dżokera jego typu podstawowego %2.</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -9181,17 +9763,17 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+18"/>
         <source>Element %1 does not match namespace constraint of wildcard in base particle.</source>
-        <translation>Element %1 nie pasuje do znacznika w ograniczeniu przestrzeni nazw w elemencie podstawowym.</translation>
+        <translation>Element %1 nie pasuje do ograniczenia przestrzeni nazw dżokera w elemencie podstawowym.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Wildcard in derived particle is not a valid subset of wildcard in base particle.</source>
-        <translation>Znacznik w wywiedzionym elemencie nie jest poprawnym podzbiorem znacznika w elemencie podstawowym.</translation>
+        <translation>Dżoker w wywiedzionym elemencie nie jest poprawnym podzbiorem dżokera w elemencie podstawowym.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>processContent of wildcard in derived particle is weaker than wildcard in base particle.</source>
-        <translation>&quot;processContent&quot; znacznika w wywiedzionym elemencie jest słabszy od znacznika w podstawowym elemencie.</translation>
+        <translation>&quot;processContent&quot; dżokera w wywiedzionym elemencie jest słabszy od dżokera w podstawowym elemencie.</translation>
     </message>
     <message>
         <location line="+240"/>
@@ -9385,7 +9967,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
         <location line="+131"/>
-        <source>Component with id %1 has been defined previously.</source>
+        <source>Component with ID %1 has been defined previously.</source>
         <translation>Komponent o identyfikatorze %1 został uprzednio zdefiniowany.</translation>
     </message>
     <message>
@@ -9421,7 +10003,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+11"/>
         <source>Identity constraint %1 already defined.</source>
-        <translation>Ograniczenie jednostki %1 jest już zdefiniowane.</translation>
+        <translation>Narzucenie niepowtarzalności %1 jest już zdefiniowane.</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -9800,11 +10382,16 @@ Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>Fixed value constrained not allowed if element is nillable.</source>
+        <source>Fixed value constraint not allowed if element is nillable.</source>
         <translation>Ograniczenie stałej wartości jest niedozwolone gdy element jest zerowalny.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+230"/>
+        <source>Element %1 cannot contain other elements, as it has a fixed content.</source>
+        <translation>Element %1 nie może zawierać innych elementów ponieważ posiada on stałą zawartość.</translation>
+    </message>
+    <message>
+        <location line="-198"/>
         <source>Specified type %1 is not validly substitutable with element type %2.</source>
         <translation>Podany typ %1 nie jest poprawnie zastępowalny typem elementu %2.</translation>
     </message>
@@ -9848,19 +10435,14 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>Element %1 zawiera niedozwolony text.</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Element %1 can not contain other elements, as it has a fixed content.</source>
-        <translation>Element %1 nie może zawierać innych elementów ponieważ posiada on stałą zawartość.</translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+61"/>
         <source>Element %1 is missing required attribute %2.</source>
         <translation>Brak wymaganego atrybutu %2 w elemencie %1.</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Attribute %1 does not match the attribute wildcard.</source>
-        <translation>Atrybut %1 nie pasuje do znacznika atrybutu.</translation>
+        <translation>Atrybut %1 nie pasuje do atrybutu dżokera.</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -9912,7 +10494,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+40"/>
         <source>No referenced value found for key reference %1.</source>
-        <translation>Brak wartości do której odwołuje sie klucz %1.</translation>
+        <translation>Brak wartości do której odwołuje się klucz %1.</translation>
     </message>
     <message>
         <location line="+64"/>
diff --git a/translations/qvfb_pl.ts b/translations/qvfb_pl.ts
index bc3313ee2e..9b85ad965a 100644
--- a/translations/qvfb_pl.ts
+++ b/translations/qvfb_pl.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AnimationSaveWidget</name>
     <message>
-        <location filename="../tools/qvfb/qvfb.cpp" line="+865"/>
+        <location filename="../tools/qvfb/qvfb.cpp" line="+868"/>
         <location line="+204"/>
         <source>Record</source>
         <translation>Nagraj</translation>
@@ -260,6 +260,11 @@
         <source>BGR format</source>
         <translation>format BGR</translation>
     </message>
+    <message>
+        <location/>
+        <source>800x480</source>
+        <translation>800x480</translation>
+    </message>
 </context>
 <context>
     <name>DeviceSkin</name>
@@ -322,12 +327,12 @@
 <context>
     <name>QVFb</name>
     <message>
-        <location filename="../tools/qvfb/qvfb.cpp" line="-501"/>
+        <location filename="../tools/qvfb/qvfb.cpp" line="-504"/>
         <source>Browse...</source>
         <translation>Przeglądaj...</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+143"/>
         <source>Load Custom Skin...</source>
         <translation>Załaduj skórki użytkownika...</translation>
     </message>
diff --git a/util/s60pixelmetrics/pm_mapper.hrh b/util/s60pixelmetrics/pm_mapper.hrh
index 4822654e80..f46a963d74 100644
--- a/util/s60pixelmetrics/pm_mapper.hrh
+++ b/util/s60pixelmetrics/pm_mapper.hrh
@@ -55,16 +55,9 @@ enum
     {
     ECmdStartCalculations = 8500,
     ECmdSwitchOrientation,
-    ECmdSwitchMirroring,
     ECmdStatus,
     ECmdSwitchOutput,
-    ECmdCreateHeaderFile,
-    ECmdSetAutoMode
-    };
-
-enum
-    {
-    EWaitNote = 9000
+    ECmdCreateHeaderFile
     };
 
 #endif    // PMMAPPER_HRH
diff --git a/util/s60pixelmetrics/pm_mapper.rss b/util/s60pixelmetrics/pm_mapper.rss
index 22817ade5d..8071b44367 100644
--- a/util/s60pixelmetrics/pm_mapper.rss
+++ b/util/s60pixelmetrics/pm_mapper.rss
@@ -150,11 +150,9 @@ RESOURCE MENU_PANE r_pmmapper_system_menu
         {
         MENU_ITEM { command = ECmdStartCalculations; txt = "Start calculations"; },
         MENU_ITEM { command = ECmdSwitchOrientation; txt = "Switch orientation"; },
-        MENU_ITEM { command = ECmdSwitchMirroring;   txt = "Switch mirroring";},
         MENU_ITEM { command = ECmdStatus;            txt = "Status"; },
         MENU_ITEM { command = ECmdSwitchOutput;      txt = "Switch output (file/screen)"; },
-        MENU_ITEM { command = ECmdCreateHeaderFile;  txt = "Create header file"; },
-        MENU_ITEM { command = ECmdSetAutoMode;       txt = "Switch autoMode";}
+        MENU_ITEM { command = ECmdCreateHeaderFile;  txt = "Create header file"; }
         };
     }
 
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index de6af0d202..19d3b3643d 100644
--- a/util/s60pixelmetrics/pm_mapperapp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -65,7 +65,6 @@
 #include <aknglobalnote.h>
 
 #include <CentralRepository.h>
-#include <AvkonInternalCRKeys.h>    // KAknLayoutId
 
 #include <Aknsutils.h>
 #include <AknUtils.h>
@@ -89,7 +88,7 @@ _LIT(KEndBraceWithCommaAndCRLF, "},\n");
 _LIT(KCRLF, "\n");
 
 // Number of header lines in layout data.
-const TInt KHeaderValues = 5;
+const TInt KHeaderValues = 4;
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -156,37 +155,27 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             Exit();
             break;
         case ECmdSwitchOutput:
+		    {
+            HBufC* buffer = HBufC::NewLC( 100 );
+            TPtr bufferPtr = buffer->Des();
+            TBool last = ETrue;
+            bufferPtr.Append(_L("Output switched to "));
             iFileOutputOn = !iFileOutputOn;
+            if (iFileOutputOn)
+                bufferPtr.Append(_L("file."));
+            else
+                bufferPtr.Append(_L("screen."));
+            ShowL( *buffer, last );
+			}
             break;
         case ECmdStatus:
             {
             ClearL();
 
             // layout
-            CRepository* repository = NULL;
-            TInt value = KErrNotFound;
-            TRAPD(ret, repository = CRepository::NewL(KCRUidAvkon));
-            if (ret == KErrNone)
-                {
-                ret = repository->Get(KAknLayoutId, value);
-                }
-            delete repository;
-            ret= 0;
             HBufC* buffer = HBufC::NewLC( 100 );
             TPtr bufferPtr = buffer->Des();
-            bufferPtr.Append(_L("Layout: "));
-            if (ret==KErrNone)
-                {
-                bufferPtr.AppendNum(value);
-                }
-            else
-                {
-                bufferPtr.Append(_L("(error) "));
-                bufferPtr.AppendNum(ret);
-                }
             TBool last = ETrue;
-            ShowL( *buffer, last );
-            bufferPtr.Zero();
 
             // Orientation
             bufferPtr.Append(_L("Orientation: "));
@@ -201,12 +190,6 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             ShowL( *buffer, last );
             bufferPtr.Zero();
 
-            // Automode
-            bufferPtr.Append(_L("AutoMode: "));
-            bufferPtr.AppendNum((TInt)iAutoMode);
-            ShowL( *buffer, last );
-            bufferPtr.Zero();
-
             CAknLayoutConfig::TScreenMode localAppScreenMode = CAknSgcClient::ScreenMode();
             TInt hashValue = localAppScreenMode.ScreenStyleHash();
             TPixelsTwipsAndRotation pixels = CAknSgcClient::PixelsAndRotation();
@@ -261,47 +244,24 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             CleanupStack::PopAndDestroy( buffer );
             }
             break;
-        case ECmdSwitchMirroring:
-            {
-            // set the shared data value
-            CRepository* repository = NULL;
-            TRAPD(ret, repository = CRepository::NewL(KCRUidAvkon));
-            if (ret == KErrNone)
-                {
-                TInt value = KErrNotFound;
-                repository->Get(KAknLayoutId, value);
-                if ( value == EAknLayoutIdELAF)
-                    {
-                    value = EAknLayoutIdABRW;
-                    }
-                else if (value ==EAknLayoutIdABRW)
-                    {
-                    value = EAknLayoutIdELAF;
-                    }
-                ret = repository->Set(KAknLayoutId, value);
-                }
-            delete repository;
-            // now inform all open apps of the switch
-            TWsEvent event;
-            event.SetType(KEikDynamicLayoutVariantSwitch);
-            iEikonEnv->WsSession().SendEventToAllWindowGroups(event);
-            }
-            break;
         case ECmdSwitchOrientation:
             {
             ClearL();
+            HBufC* buffer = HBufC::NewLC( 100 );
+            TPtr bufferPtr = buffer->Des();
+            TBool last = ETrue;
+
             #ifndef __SERIES60_31__
             if (!iAvkonAppUi->OrientationCanBeChanged())
                 {
-                HBufC* buffer = HBufC::NewLC( 100 );
-                TPtr bufferPtr = buffer->Des();
                 bufferPtr.Append(_L("Orientation cannot be changed."));
-                TBool last = EFalse;
                 ShowL( *buffer, last );
                 bufferPtr.Zero();
                 delete buffer;
+                break;
                 }
             #endif //__SERIES60_31__
+
             if ( iAvkonAppUi->Orientation() == CAknAppUiBase::EAppUiOrientationPortrait)
                 {
                 iAvkonAppUi->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape);
@@ -314,15 +274,11 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
                 {
                 // unspecified
                 iAvkonAppUi->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape);
-                /*User::After(100000);
-                HBufC* buffer = HBufC::NewLC( 100 );
-                TPtr bufferPtr = buffer->Des();
-                bufferPtr.Append(_L("Orientation unspecified."));
-                TBool last = EFalse;
-                ShowL( *buffer, last );
-                bufferPtr.Zero();
-                delete buffer;*/
                 }
+            bufferPtr.Append(_L("Orientation changed."));
+            ShowL( *buffer, last );
+            bufferPtr.Zero();
+            delete buffer;
             break;
             }
         case ECmdStartCalculations:
@@ -362,12 +318,6 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
                 tgt.AppendNum(version.minorVersion, EDecimal); // put minor version into text file
                 ShowL( tgt, last );
                 tgt.Zero();
-                // MIRRORED
-                TBool mirrored = AknLayoutUtils::LayoutMirrored();
-                tgt.Append(_L("mirrored: \t"));
-                tgt.AppendNum(mirrored, EDecimal); // put mirrored state into text file
-                ShowL( tgt, last );
-                tgt.Zero();
                 }
 
             TInt myValue = KErrNotFound;
@@ -385,33 +335,15 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
                 if (index==QStyle::PM_SubMenuOverlap) index = QStyle::PM_CustomBase;
                 index++;
                 }
-            if (iAutoMode && !iMode)
-                {
-                HandleCommandL(ECmdSwitchMirroring);
-                iMode = ETrue;
-                }
             }
             break;
         case ECmdCreateHeaderFile:
             CreateHeaderFileL();
             break;
-        case ECmdSetAutoMode:
-            iAutoMode = !iAutoMode;
         default:
             break;
         }
     }
-void CPixelMetricsMapperAppUi::DoAutoOperationL()
-    {
-    HandleCommandL(ECmdStartCalculations);
-    iMode = EFalse;
-    HandleCommandL(ECmdSwitchMirroring);
-    }
-
-TBool CPixelMetricsMapperAppUi::ReadyForAutoOp() const
-    {
-    return (iAutoMode && iMode);
-    }
 
 // -----------------------------------------------------------------------------
 //
@@ -834,21 +766,7 @@ void CPixelMetricsMapperAppUi::CreateHeaderFileL() const
             User::LeaveIfError( lex.Val(nextValue) );
             if ( loop <= KHeaderValues-1)
                 {
-                if (loop == KHeaderValues -1 ) // true / false values
-                    {
-                    if (nextValue == 1)
-                        {
-                        bufferLayoutHdr.Append(_L("true"));
-                        }
-                    else
-                        {
-                        bufferLayoutHdr.Append(_L("false"));
-                        }
-                    }
-                else
-                    {
-                    bufferLayoutHdr.AppendNum(nextValue);
-                    }
+                bufferLayoutHdr.AppendNum(nextValue);
                 }
             else
                 {
@@ -882,13 +800,11 @@ TFileName CPixelMetricsMapperAppUi::CreateLayoutNameL(TFileText& aFileHandle) co
     // Layout data is deployed like this:
     // first line - height
     // second line - width
-    // fifth line mirror info
     TFileName lines;
     TFileName layoutName;
 
     TInt height = -666;
     TInt width = -666;
-    TInt mirroring = -666;
     // Collect name information.
     for (TInt i=0; i<6; i++)
         {
@@ -907,10 +823,6 @@ TFileName CPixelMetricsMapperAppUi::CreateLayoutNameL(TFileText& aFileHandle) co
             {
             error = myLexer.Val(width);
             }
-        if (i==4) //mirror info is fourth
-            {
-            error = myLexer.Val(mirroring);
-            }
         User::LeaveIfError(error);
         }
 
@@ -966,10 +878,6 @@ TFileName CPixelMetricsMapperAppUi::CreateLayoutNameL(TFileText& aFileHandle) co
         {
         layoutName.Append(_L("Portrait"));
         }
-    if (mirroring)
-        {
-        layoutName.Append(_L(" Mirrored"));
-        }
     return layoutName;
     }
 
diff --git a/util/s60pixelmetrics/pm_mapperapp.h b/util/s60pixelmetrics/pm_mapperapp.h
index cd119bce64..aa6a63b92c 100644
--- a/util/s60pixelmetrics/pm_mapperapp.h
+++ b/util/s60pixelmetrics/pm_mapperapp.h
@@ -111,7 +111,7 @@ class CPixelMetricsMapperAppUi : public CAknViewAppUi
         /**
         * Constructor.
         */
-    	CPixelMetricsMapperAppUi();
+        CPixelMetricsMapperAppUi();
 
         /**
         * Symbian 2nd phase constructor.
@@ -123,12 +123,6 @@ class CPixelMetricsMapperAppUi : public CAknViewAppUi
         */
         ~CPixelMetricsMapperAppUi();
 
-    public:
-    	void DoAutoOperationL();
-
-    	TBool ReadyForAutoOp() const;
-
-
     private: // Functions from base classes
 
         /**
@@ -158,18 +152,16 @@ class CPixelMetricsMapperAppUi : public CAknViewAppUi
     private:    // Data
 
         // Test view.
-    	CPixelMetricsMapperView* iView;
+        CPixelMetricsMapperView* iView;
 
         CEikDialog* iDialog;
 
         TBool iFileOutputOn;
+        TBool iMode;
 
         CFbsBitmap* icon;
         CFbsBitmap* iconMask;
 
-        TBool iAutoMode;
-        TBool iMode;
-
     };
 
 
diff --git a/util/s60pixelmetrics/pm_mapperview.cpp b/util/s60pixelmetrics/pm_mapperview.cpp
index 82b825daf3..04bc3e8257 100644
--- a/util/s60pixelmetrics/pm_mapperview.cpp
+++ b/util/s60pixelmetrics/pm_mapperview.cpp
@@ -129,8 +129,6 @@ void CPixelMetricsMapperViewContainer::ShowL( const TDesC& aString, TBool& aLast
             fileName.Append('_');
             fileName.AppendNum(width);
 
-            if (AknLayoutUtils::LayoutMirrored())
-                fileName.Append(_L("_mirrored"));
             fileName.Append(_L(".txt"));
 
             TInt err=file.Open(fs,fileName,EFileStreamText|EFileWrite|EFileShareAny);
@@ -263,11 +261,9 @@ void CPixelMetricsMapperViewContainer::HandleResourceChange(TInt aType)
              mainPaneRect );
          SetRect( mainPaneRect );
 
-         CPixelMetricsMapperAppUi* myApp = static_cast<CPixelMetricsMapperAppUi*> (ControlEnv()->AppUi());
-         if (myApp->ReadyForAutoOp())
-        	 myApp->DoAutoOperationL();
          }
-    if (iListbox) iListbox->HandleResourceChange(aType);
+    if (iListbox)
+        iListbox->HandleResourceChange(aType);
     }
 
 
@@ -329,6 +325,7 @@ void CPixelMetricsMapperView::HandleCommandL( TInt aCommand )
     AppUi()->HandleCommandL( aCommand );
     }
 
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -342,6 +339,7 @@ void CPixelMetricsMapperView::HandleStatusPaneSizeChange()
         }
     }
 
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -358,6 +356,7 @@ void CPixelMetricsMapperView::DoActivateL(
     AppUi()->AddToViewStackL( *this, iView );
     }
 
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -372,4 +371,5 @@ void CPixelMetricsMapperView::DoDeactivate()
     iView = NULL;
     }
 
+
 // End of File
diff --git a/util/s60pixelmetrics/pm_mapperview.h b/util/s60pixelmetrics/pm_mapperview.h
index be40a152aa..36376cd929 100644
--- a/util/s60pixelmetrics/pm_mapperview.h
+++ b/util/s60pixelmetrics/pm_mapperview.h
@@ -219,7 +219,7 @@ class CPixelMetricsMapperView : public CAknView
     private:    // Data
 
         // The view container.
-    	CPixelMetricsMapperViewContainer*    iView;
+        CPixelMetricsMapperViewContainer*    iView;
 
     };